RM action report - rm elig/enroll/setup - col + filter

app/Http/Controllers/PracticeManagementController.php

@@ -3788,8 +3788,15 @@ ORDER BY c.name_last, c.name_first
         // start date
         $conditions[] = "(cm.start_date >= '$careMonthStartDate')";
 
-        // only those enrolled in rm
-        $conditions[] = "(c.is_enrolled_in_rm = 'YES')";
+        if($request->input('rm_eligible')) {
+            $conditions[] = "(c.is_eligible_for_rm = '" . $request->input('rm_eligible') . "')";
+        }
+        if($request->input('rm_enrolled')) {
+            $conditions[] = "(c.is_enrolled_in_rm = '" . $request->input('rm_enrolled') . "')";
+        }
+        if($request->input('rm_setup')) {
+            $conditions[] = "(c.has_rm_setup_been_performed IS " . ($request->input('rm_setup') === 'YES' ? 'TRUE' : 'FALSE') . ")";
+        }
 
         // measurement days
         if($numOfMeasurements){
@@ -3861,6 +3868,9 @@ ORDER BY c.name_last, c.name_first
             cm.uid as care_month_uid,
             cm.start_date,
             c.uid as client_uid,
+            c.is_eligible_for_rm,
+            c.is_enrolled_in_rm,
+            c.has_rm_setup_been_performed,
             (c.name_first || ' ' || c.name_last) as client_name,
             (mcp.name_first || ' ' || mcp.name_last) as mcp_name,
             (rmm.name_first || ' ' || rmm.name_last) as rmm_name,

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 99,
+    'asset_version' => 100,
 
 
     'temp_dir' => env('TEMP_DIR'),

public/css/style.css

@@ -3689,5 +3689,5 @@ table.v-top th {
     border-radius: 100%;
     text-align: center;
     line-height: 12px;
-    right: -12px;
-}
+    right: calc(50% - 7px);
+}

resources/views/app/practice-management/rm-action-report.blade.php

@@ -114,6 +114,41 @@
                         </div>
                     </div>
 
+                    <div class="sm-section">
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Eligible for RM:</label>
+                            <select name="rm_eligible" class="form-control input-sm">
+                                <option {{request()->input('rm_eligible') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('rm_eligible') === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                                <option {{request()->input('rm_eligible') === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                                <option {{request()->input('rm_eligible') === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="sm-section">
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Eligible for RM:</label>
+                            <select name="rm_enrolled" class="form-control input-sm">
+                                <option {{request()->input('rm_enrolled') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('rm_enrolled') === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                                <option {{request()->input('rm_enrolled') === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                                <option {{request()->input('rm_enrolled') === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="sm-section">
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">RM Setup:</label>
+                            <select name="rm_setup" class="form-control input-sm">
+                                <option {{request()->input('rm_setup') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('rm_setup') === 'YES' ? 'selected' : ''}} value="YES">Performed</option>
+                                <option {{request()->input('rm_setup') === 'NO' ? 'selected' : ''}} value="NO">Not Performed</option>
+                            </select>
+                        </div>
+                    </div>
+
                     <div>
                         <div class="form-group m-0">
                             <label class="font-weight-normal mb-1">&nbsp;</label>
@@ -130,6 +165,9 @@
                     <tr>
                         <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Month', 'key' => 'start_date'])</th>
                         <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Patient', 'key' => 'client_name'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RM<br>Elig.', 'key' => 'is_eligible_for_rm'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RM<br>Enrol', 'key' => 'is_enrolled_in_rm'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RM<br>Setup', 'key' => 'has_rm_setup_been_performed'])</th>
                         <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'MCP', 'key' => 'mcp_name'])</th>
                         <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RMM', 'key' => 'rmm_name'])</th>
                         <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Meas.<br>Days', 'key' => 'number_of_days_with_remote_measurements'])</th>
@@ -163,7 +201,10 @@
                             <a href="/patients/view/{{$row->client_uid}}">
                                 {{$row->client_name}}
                             </a>
-                        </td>                        
+                        </td>
+                        <td>{{ucwords(strtolower($row->is_eligible_for_rm))}}</td>
+                        <td>{{ucwords(strtolower($row->is_enrolled_in_rm))}}</td>
+                        <td>{{$row->has_rm_setup_been_performed ? 'Yes' : 'No'}}</td>
                         <td>
                             {{$row->mcp_name}}
                         </td>