ops-tech updates in rpm admin

app/Http/Controllers/PracticeManagementController.php

@@ -1947,10 +1947,16 @@ WHERE
             $v = trim($request->input('m'));
             $conditions[] = "(EXTRACT(MONTH from care_month.start_date) = $v)";
         }
+        else { // default to current month
+            $conditions[] = "(EXTRACT(MONTH from care_month.start_date) = EXTRACT(MONTH from NOW()))";
+        }
         if(trim($request->input('y'))) {
             $v = trim($request->input('y'));
             $conditions[] = "(EXTRACT(YEAR from care_month.start_date) = $v)";
         }
+        else { // default to current month
+            $conditions[] = "(EXTRACT(YEAR from care_month.start_date) = EXTRACT(YEAR from NOW()))";
+        }
 
         if(trim($request->input('f_ces'))) {
             $v = trim($request->input('f_ces'));
@@ -2394,11 +2400,11 @@ WHERE
         $stats['gt20M'] = 0;
         $stats['gt40M'] = 0;
 
-
-        /*$stats['totalPatients'] = $paginator->total();
+        $stats['totalPatients'] = $paginator->total();
         $commonStatSQL = "
 SELECT COUNT(*)
 FROM care_month join client on care_month.client_id = client.id
+" . ($request->input('f_mcp') ? "left join pro mcpPro on care_month.mcp_pro_id = mcpPro.id" : "") . "
 WHERE
         ";
 
@@ -2445,7 +2451,7 @@ EXISTS (SELECT 1 FROM measurement mstat WHERE mstat.care_month_id = care_month.i
       " . (count($conditions) > 0 ? implode(" AND ", $conditions) : '1') . "
 ";
         $statResult = DB::select($statQuery);
-        $stats['gt40M'] = $statResult[0]->count;*/
+        $stats['gt40M'] = $statResult[0]->count;
 
         if($request->get('_ql')) dd(DB::getQueryLog());
 

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

@@ -66,34 +66,34 @@
                     <div class="d-flex d-none align-items-start mt-2 pt-1 border-top">
 
                         <div class="max-width-110px mr-2">
-                            <label class="mb-0 text-sm {{request()->input('m') && request()->input('m') !== 'ACTIVE' ? 'font-weight-bold text-info' : 'text-secondary'}}">Month</label>
+                            <label class="mb-0 text-sm font-weight-bold text-info">Month</label>
+                            <?php $m = request()->input('m') ? intval(request()->input('m')) : intval(date('m')); ?>
                             <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') && 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>
+                                <option value="01" {{$m === 1 ? 'selected' : ''}}>Jan</option>
+                                <option value="02" {{$m === 2 ? 'selected' : ''}}>Feb</option>
+                                <option value="03" {{$m === 3 ? 'selected' : ''}}>Mar</option>
+                                <option value="04" {{$m === 4 ? 'selected' : ''}}>Apr</option>
+                                <option value="05" {{$m === 5 ? 'selected' : ''}}>May</option>
+                                <option value="06" {{$m === 6 ? 'selected' : ''}}>Jun</option>
+                                <option value="07" {{$m === 7 ? 'selected' : ''}}>Jul</option>
+                                <option value="08" {{$m === 8 ? 'selected' : ''}}>Aug</option>
+                                <option value="09" {{$m === 9 ? 'selected' : ''}}>Sep</option>
+                                <option value="10" {{$m === 10 ? 'selected' : ''}}>Oct</option>
+                                <option value="11" {{$m === 11 ? 'selected' : ''}}>Nov</option>
+                                <option value="12" {{$m === 12 ? 'selected' : ''}}>Dec</option>
                             </select>
                         </div>
 
                         <div class="max-width-110px mr-2">
-                            <label class="mb-0 text-sm {{request()->input('y') && request()->input('y') !== 'ACTIVE' ? 'font-weight-bold text-info' : 'text-secondary'}}">Year</label>
+                            <label class="mb-0 text-sm font-weight-bold text-info">Year</label>
+                            <?php $y = request()->input('y') ? intval(request()->input('y')) : intval(date('Y')); ?>
                             <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') && 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>
-                                <option value="2023" {{request()->input('y') && intval(request()->input('y')) === 2023? 'selected' : ''}}>2023</option>
-                                <option value="2024" {{request()->input('y') && intval(request()->input('y')) === 2024? 'selected' : ''}}>2024</option>
-                                <option value="2025" {{request()->input('y') && intval(request()->input('y')) === 2025? 'selected' : ''}}>2025</option>
+                                <option value="2020" {{$y === 2020 ? 'selected' : ''}}>2020</option>
+                                <option value="2021" {{$y === 2021 ? 'selected' : ''}}>2021</option>
+                                <option value="2022" {{$y === 2022 ? 'selected' : ''}}>2022</option>
+                                <option value="2023" {{$y === 2023? 'selected' : ''}}>2023</option>
+                                <option value="2024" {{$y === 2024? 'selected' : ''}}>2024</option>
+                                <option value="2025" {{$y === 2025? 'selected' : ''}}>2025</option>
                             </select>
                         </div>