Preserve old <select> values on form error back-redirect

app/Console/Commands/GenerateTreeCommand.php

@@ -645,7 +645,9 @@ class GenController {
                     ">";
                 $code[] = "<option value=''>-- Select --</option>";
                 foreach ($options as $o) {
-                    $code[] = "<option value='$o'>$o</option>";
+                    $code[] = "<option " .
+                        "<?= '$o' === (old('$name') ? old('$name') : " . ($default ? "\$record->$default" : "''") . ") ? 'selected' : '' ?> " .
+                        "value='$o'>$o</option>";
                 }
                 $code[] = "</select>";
                 break;
@@ -655,7 +657,9 @@ class GenController {
                 $code[] = "<option value=''>-- Select --</option>";
                 $code[] = "<?php \$dbOptions = \Illuminate\Support\Facades\DB::table('{$options['table']}')->get(); ?>";
                 $code[] = "<?php foreach(\$dbOptions as \$o): ?>";
-                $code[] = "<option value='<?= \$o->{$options['valueField']} ?>'><?= \$o->{$options['displayField']} ?> (<?= \$o->{$options['valueField']} ?>)</option>";
+                $code[] = "<option " .
+                    "<?= \$o->{$options['valueField']} === (old('$name') ? old('$name') : " . ($default ? "\$record->$default" : "''") . ") ? 'selected' : '' ?> " .
+                    "value='<?= \$o->{$options['valueField']} ?>'><?= \$o->{$options['displayField']} ?> (<?= \$o->{$options['valueField']} ?>)</option>";
                 $code[] = "<?php endforeach; ?>";
                 $code[] = "</select>";
                 break;

resources/views/admin/pro_rates/add_new.blade.php

@@ -29,7 +29,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('proUid') ? old('proUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -37,8 +37,8 @@
 <label class='control-label'>As Hcp Or Ally</label>
 <select class='form-control' name='asHcpOrAlly' value='{{ old('asHcpOrAlly') ? old('asHcpOrAlly') : '' }}' >
 <option value=''>-- Select --</option>
-<option value='HCP'>HCP</option>
-<option value='ALLY'>ALLY</option>
+<option <?= 'HCP' === (old('asHcpOrAlly') ? old('asHcpOrAlly') : '') ? 'selected' : '' ?> value='HCP'>HCP</option>
+<option <?= 'ALLY' === (old('asHcpOrAlly') ? old('asHcpOrAlly') : '') ? 'selected' : '' ?> value='ALLY'>ALLY</option>
 </select>
 </div>
 <div class='form-group mb-3'>

resources/views/pro/bills/add_new_for_note.blade.php

@@ -29,7 +29,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('note')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->uid ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('noteUid') ? old('noteUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->uid ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

resources/views/pro/care_month_entries/add_new_for_cm.blade.php

@@ -29,7 +29,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('care_month')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->start_date ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('careMonthUid') ? old('careMonthUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->start_date ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -39,7 +39,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('proUid') ? old('proUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

resources/views/pro/care_month_entries/add_new_for_rm.blade.php

@@ -29,7 +29,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('care_month')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->start_date ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('careMonthUid') ? old('careMonthUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->start_date ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -39,7 +39,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('proUid') ? old('proUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

resources/views/pro/care_months/add_new.blade.php

@@ -29,7 +29,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('client')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('clientUid') ? old('clientUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

resources/views/pro/my_clients/add_new.blade.php

@@ -29,7 +29,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('team')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->team_number ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('teamUid') ? old('teamUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->team_number ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -39,7 +39,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('mcpProUid') ? old('mcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -49,7 +49,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('allyProUid') ? old('allyProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -89,8 +89,8 @@
 <label class='control-label'>Gender</label>
 <select class='form-control' name='gender' value='{{ old('gender') ? old('gender') : '' }}' >
 <option value=''>-- Select --</option>
-<option value='M'>M</option>
-<option value='F'>F</option>
+<option <?= 'M' === (old('gender') ? old('gender') : '') ? 'selected' : '' ?> value='M'>M</option>
+<option <?= 'F' === (old('gender') ? old('gender') : '') ? 'selected' : '' ?> value='F'>F</option>
 </select>
 </div>
 <div class='form-group mb-3'>

resources/views/pro/my_clients_SINGLE/ACTION_manuallySetIsPartBPrimaryConfirmedToFalse.blade.php

@@ -22,8 +22,8 @@
 <label class='control-label'>Part BConfirmation Method</label>
 <select class='form-control' name='partBConfirmationMethod' value='{{ old('partBConfirmationMethod') ? old('partBConfirmationMethod') : $record->partbconfirmation_method }}' >
 <option value=''>-- Select --</option>
-<option value='MANUAL'>MANUAL</option>
-<option value='API'>API</option>
+<option <?= 'MANUAL' === (old('partBConfirmationMethod') ? old('partBConfirmationMethod') : $record->partbconfirmation_method) ? 'selected' : '' ?> value='MANUAL'>MANUAL</option>
+<option <?= 'API' === (old('partBConfirmationMethod') ? old('partBConfirmationMethod') : $record->partbconfirmation_method) ? 'selected' : '' ?> value='API'>API</option>
 </select>
 </div>
 <div class='form-group mb-3'>

resources/views/pro/my_clients_SINGLE/ACTION_manuallySetIsPartBPrimaryConfirmedToTrue.blade.php

@@ -22,8 +22,8 @@
 <label class='control-label'>Part BConfirmation Method</label>
 <select class='form-control' name='partBConfirmationMethod' value='{{ old('partBConfirmationMethod') ? old('partBConfirmationMethod') : $record->partbconfirmation_method }}' >
 <option value=''>-- Select --</option>
-<option value='MANUAL'>MANUAL</option>
-<option value='API'>API</option>
+<option <?= 'MANUAL' === (old('partBConfirmationMethod') ? old('partBConfirmationMethod') : $record->partbconfirmation_method) ? 'selected' : '' ?> value='MANUAL'>MANUAL</option>
+<option <?= 'API' === (old('partBConfirmationMethod') ? old('partBConfirmationMethod') : $record->partbconfirmation_method) ? 'selected' : '' ?> value='API'>API</option>
 </select>
 </div>
 <div class='form-group mb-3'>

resources/views/pro/my_clients_SINGLE/ACTION_notesAddNew.blade.php

@@ -25,7 +25,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('hcpProUid') ? old('hcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -35,7 +35,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('allyProUid') ? old('allyProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

resources/views/pro/my_clients_SINGLE/ACTION_putAlly.blade.php

@@ -24,7 +24,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('allyProUid') ? old('allyProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

resources/views/pro/my_clients_SINGLE/ACTION_putGender.blade.php

@@ -22,8 +22,8 @@
 <label class='control-label'>Gender</label>
 <select class='form-control' name='gender' value='{{ old('gender') ? old('gender') : $record->gender }}' >
 <option value=''>-- Select --</option>
-<option value='M'>M</option>
-<option value='F'>F</option>
+<option <?= 'M' === (old('gender') ? old('gender') : $record->gender) ? 'selected' : '' ?> value='M'>M</option>
+<option <?= 'F' === (old('gender') ? old('gender') : $record->gender) ? 'selected' : '' ?> value='F'>F</option>
 </select>
 </div>
         <div class="form-group mb-3">

resources/views/pro/my_clients_SINGLE/ACTION_putMcp.blade.php

@@ -24,7 +24,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('mcpProUid') ? old('mcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

resources/views/pro/my_clients_SINGLE/ACTION_putTeam.blade.php

@@ -24,7 +24,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('team')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->team_number ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('teamUid') ? old('teamUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->team_number ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

resources/views/pro/my_teams/add_new.blade.php

@@ -29,7 +29,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('hcpProUid') ? old('hcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -39,7 +39,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('allyProUid') ? old('allyProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

resources/views/pro/notes/add_new.blade.php

@@ -29,7 +29,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('client')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('clientUid') ? old('clientUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -39,7 +39,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('hcpProUid') ? old('hcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>
@@ -49,7 +49,7 @@
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('allyProUid') ? old('allyProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>