fixed rm action report

app/Http/Controllers/PracticeManagementController.php

@@ -2457,6 +2457,13 @@ ORDER BY c.name_last, c.name_first
         if(!$careMonthStartDate){
             $careMonthStartDate = '2022-01-01';
         }
+
+        $lastDateOfMonth = new DateTime(date("Y-m-t", strtotime($careMonthStartDate)));
+        $today = new DateTime(get_current_date());
+        $diff = $lastDateOfMonth->diff($today);
+        $daysBetweenNowAndEndmonth = $diff->days;
+        $minRequiredMeasurements = 16 - $daysBetweenNowAndEndmonth;
+
         $numOfMeasurements = $request->get('num_of_measurements'); //16_or_more, 12_or_more
         $hasRecentVisit = $request->get('has_recent_visit'); //yes no
         $hasBeenSpokenToThisMonth = $request->get('has_been_spoken_to'); //yes no 
@@ -2473,10 +2480,14 @@ ORDER BY c.name_last, c.name_first
             if($numOfMeasurements  == '16_or_more'){
                 $cmQuery = $cmQuery->where('number_of_days_with_remote_measurements', '>=', 16);
             }
-            if($numOfMeasurements  == '12_or_more'){
-                $cmQuery = $cmQuery->where('number_of_days_with_remote_measurements', '>=', 12)
+            if($numOfMeasurements  == 'min_or_more'){
+                $cmQuery = $cmQuery->where('number_of_days_with_remote_measurements', '>=', $minRequiredMeasurements)
                 ->where('number_of_days_with_remote_measurements', '<', 16);
             }
+
+            if($numOfMeasurements  == 'less_than_min'){
+                $cmQuery = $cmQuery->where('number_of_days_with_remote_measurements', '<', $minRequiredMeasurements);
+            }
         }
 
         if($hasRecentVisit){
@@ -2502,7 +2513,7 @@ ORDER BY c.name_last, c.name_first
 
         $rows = $cmQuery->paginate(50);
 
-        return view('app.practice-management.rm-action-report', compact('rows', 'filters'));
+        return view('app.practice-management.rm-action-report', compact('rows', 'filters', 'minRequiredMeasurements'));
 
     }
 

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

@@ -47,8 +47,9 @@
                             <label>Number Of Measurement Days:</label>
                             <select name="num_of_measurements" class="form-control input-sm" v-model="filters.num_of_measurements">
                                 <option value="">All</option>
-                                <option value="16_or_more">16+</option>
-                                <option value="12_or_more">12+</option>
+                                <option value="16_or_more">16 or more</option>
+                                <option value="min_or_more">{{$minRequiredMeasurements}} or more</option>
+                                <option value="less_than_min">Less than {{$minRequiredMeasurements}}</option>
                             </select>
                         </div>
                     </div>