Преглед изворни кода

RPM (admin) filter value auto-populate bug fix

Vijayakrishnan пре 2 година
родитељ
комит
02ed38a45a
1 измењених фајлова са 15 додато и 15 уклоњено
  1. 15 15
      resources/views/app/practice-management/rpm-matrix-for-admin.blade.php

+ 15 - 15
resources/views/app/practice-management/rpm-matrix-for-admin.blade.php

@@ -40,18 +40,18 @@
                             <label class="mb-0 text-sm {{request()->input('m') && request()->input('m') !== 'ACTIVE' ? 'font-weight-bold text-info' : 'text-secondary'}}">Month</label>
                             <select name="m" class="mr-2 form-control form-control-sm min-width-unset max-width-110px pl-0">
                                 <option value="">All</option>
-                                <option value="01" {{request()->input('m') === '1' ? 'selected' : ''}}>Jan</option>
-                                <option value="02" {{request()->input('m') === '2' ? 'selected' : ''}}>Feb</option>
-                                <option value="03" {{request()->input('m') === '3' ? 'selected' : ''}}>Mar</option>
-                                <option value="04" {{request()->input('m') === '4' ? 'selected' : ''}}>Apr</option>
-                                <option value="05" {{request()->input('m') === '5' ? 'selected' : ''}}>May</option>
-                                <option value="06" {{request()->input('m') === '6' ? 'selected' : ''}}>Jun</option>
-                                <option value="07" {{request()->input('m') === '7' ? 'selected' : ''}}>Jul</option>
-                                <option value="08" {{request()->input('m') === '8' ? 'selected' : ''}}>Aug</option>
-                                <option value="09" {{request()->input('m') === '9' ? 'selected' : ''}}>Sep</option>
-                                <option value="10" {{request()->input('m') === '10' ? 'selected' : ''}}>Oct</option>
-                                <option value="11" {{request()->input('m') === '11' ? 'selected' : ''}}>Nov</option>
-                                <option value="12" {{request()->input('m') === '12' ? 'selected' : ''}}>Dec</option>
+                                <option value="01" {{request()->input('m') && intval(request()->input('m')) === 1 ? 'selected' : ''}}>Jan</option>
+                                <option value="02" {{request()->input('m') && intval(request()->input('m')) === 2 ? 'selected' : ''}}>Feb</option>
+                                <option value="03" {{request()->input('m') && intval(request()->input('m')) === 3 ? 'selected' : ''}}>Mar</option>
+                                <option value="04" {{request()->input('m') && intval(request()->input('m')) === 4 ? 'selected' : ''}}>Apr</option>
+                                <option value="05" {{request()->input('m') && intval(request()->input('m')) === 5 ? 'selected' : ''}}>May</option>
+                                <option value="06" {{request()->input('m') && intval(request()->input('m')) === 6 ? 'selected' : ''}}>Jun</option>
+                                <option value="07" {{request()->input('m') && intval(request()->input('m')) === 7 ? 'selected' : ''}}>Jul</option>
+                                <option value="08" {{request()->input('m') && intval(request()->input('m')) === 8 ? 'selected' : ''}}>Aug</option>
+                                <option value="09" {{request()->input('m') && intval(request()->input('m')) === 9 ? 'selected' : ''}}>Sep</option>
+                                <option value="10" {{request()->input('m') && intval(request()->input('m')) === 10 ? 'selected' : ''}}>Oct</option>
+                                <option value="11" {{request()->input('m') && intval(request()->input('m')) === 11 ? 'selected' : ''}}>Nov</option>
+                                <option value="12" {{request()->input('m') && intval(request()->input('m')) === 12 ? 'selected' : ''}}>Dec</option>
                             </select>
                         </div>
 
@@ -59,9 +59,9 @@
                             <label class="mb-0 text-sm {{request()->input('y') && request()->input('y') !== 'ACTIVE' ? 'font-weight-bold text-info' : 'text-secondary'}}">Year</label>
                             <select name="y" class="mr-2 form-control form-control-sm min-width-unset max-width-110px pl-0">
                                 <option value="">All</option>
-                                <option value="2020" {{request()->input('y') === 2020 ? 'selected' : ''}}>2020</option>
-                                <option value="2021" {{request()->input('y') === 2021 ? 'selected' : ''}}>2021</option>
-                                <option value="2022" {{request()->input('y') === 2022 ? 'selected' : ''}}>2022</option>
+                                <option value="2020" {{request()->input('y') && intval(request()->input('y')) === 2020 ? 'selected' : ''}}>2020</option>
+                                <option value="2021" {{request()->input('y') && intval(request()->input('y')) === 2021 ? 'selected' : ''}}>2021</option>
+                                <option value="2022" {{request()->input('y') && intval(request()->input('y')) === 2022 ? 'selected' : ''}}>2022</option>
                             </select>
                         </div>