Care months - show only measurements for that care-month

app/Models/Client.php

@@ -95,6 +95,22 @@ class Client extends Model
             ->orderBy('label', 'asc')
             ->orderBy('effective_date', 'desc');
     }
+
+    public function measurementsInCareMonth(CareMonth $careMonth) {
+        $cmStartDate = strtotime($careMonth->start_date);
+        $month = date("n", $cmStartDate);
+        $year = date("Y", $cmStartDate);
+        $measurements = Measurement
+            ::where('client_id', $this->id)
+            ->whereRaw('EXTRACT(MONTH FROM effective_date) = ?', [$month])
+            ->whereRaw('EXTRACT(YEAR FROM effective_date) = ?', [$year])
+            ->where('is_removed', false)
+            ->orderBy('effective_date', 'desc')
+            ->orderBy('label', 'asc')
+            ->get();
+        return $measurements;
+    }
+
     public function allMeasurements() {
         return $this->hasMany(Measurement::class, 'client_id', 'id')
             ->where('is_removed', false)

resources/views/app/patient/care-month/dashboard.blade.php

@@ -196,7 +196,7 @@
 
         <div class="row mb-3">
             <div class="col-12">
-                <div class="mt-0 pb-1">
+                <div class="mt-0">
                     <div class="d-flex align-items-center mb-2">
                         <h6 class="my-0 font-weight-bold text-dark">Measurements</h6>
                         <span class="mx-2 text-secondary">|</span>
@@ -236,8 +236,9 @@
                         </tr>
                         </thead>
                         <tbody>
-                        @foreach($patient->measurements as $measurement)
-                            @if(!empty($measurement->label) && !in_array($measurement->label, $vitalLabels))
+                        @php $measurementsInCareMonth = $patient->measurementsInCareMonth($careMonth); @endphp
+                        @foreach($measurementsInCareMonth as $measurement)
+                            @if(1 || !empty($measurement->label) && !in_array($measurement->label, $vitalLabels))
                                 <tr>
                                     <td class="px-2">{{ friendly_date_time($measurement->created_at) }}</td>
                                     <td class="px-2">{{ $measurement->label }}</td>
@@ -302,66 +303,14 @@
             </div>
         </div>
 
-        <hr class="m-negator mt-4 mb-3">
+        {{-- BDT Measurements --}}
+        {{-- <hr class="m-negator mt-4 mb-3">
 
         <div class="row mb-3">
-            {{-- BDT Measurements --}}
             <div class="col-12">
                 <div class="d-flex align-items-center">
                     <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">Cellular Measurements</h6>
                 </div>
-                {{--<div class="mt-2 pb-1">
-                    <table class="table table-sm border-0 m-0">
-                        <tbody>
-                        @foreach($patient->deviceMeasurements as $measurement)
-                            <tr>
-                                <td class="text-black p-0 border-0">
-                                    <div class="pb-1 d-flex align-items-center">
-                                        <span class="text-secondary mr-2">{{ $measurement->measurement->device_category }}:</span>
-                                        @if($measurement->measurement->device_category === 'WEIGHT')
-                                            <b class="text-nowrap">{{ round(($measurement->measurement->value_weight / 1000)*2.20462, 1) }} lb</b>
-                                        @elseif($measurement->measurement->device_category === 'BP')
-                                            <b class="text-nowrap">{{ $measurement->measurement->systolic_bp_in_mm_hg }}/{{ $measurement->measurement->diastolic_bp_in_mm_hg }} mmHg</b>
-                                        @endif
-                                        <span class="font-weight-normal text-secondary ml-2 text-sm">({{ friendly_date_time_short($measurement->measurement->created_at, true) }})</span>
-                                        <span class="ml-2 text-sm {{$measurement->status === 'NEW' ? 'text-info' : ($measurement->status === 'ACCEPTED' ? 'text-success' : 'text-sacondary')}}">{{$measurement->status}}</span>
-                                        <span>
-                                            <span moe class="ml-2" relative>
-                                                <a href="#" start show><i class="on-hover-opaque font-size-11 fa fa-edit text-primary"></i></a>
-                                                <form url="/api/clientBdtMeasurement/updateStatus" right>
-                                                    <input type="hidden" name="uid" value="{{ $measurement->uid }}">
-                                                    <div class="mb-2">
-                                                        <select name="status" class="form-control form-control-sm" required>
-                                                            <option value="">-- select --</option>
-                                                            <option {{$measurement->status === 'NEW' ? 'selected' : ''  }} value="NEW">NEW</option>
-                                                            <option {{$measurement->status === 'ACCEPTED' ? 'selected' : ''  }} value="ACCEPTED">ACCEPTED</option>
-                                                            <option {{$measurement->status === 'REJECTED' ? 'selected' : ''  }} value="REJECTED">REJECTED</option>
-                                                        </select>
-                                                    </div>
-                                                    <div class="mb-2">
-                                                        <input type="text" name="statusMemo" placeholder="Status memo" class="form-control form-control-sm">
-                                                    </div>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
-                                        </span>
-                                    </div>
-                                </td>
-                            </tr>
-                        @endforeach
-                        @if(!$patient->deviceMeasurements || count($patient->deviceMeasurements) === 0)
-                            <tr>
-                                <td class="text-secondary p-0 border-0">
-                                    No measurements
-                                </td>
-                            </tr>
-                        @endif
-                        </tbody>
-                    </table>
-                </div>--}}
                 <table class="table table-striped table-sm table-bordered mt-2 mb-0">
                     @if($patient->measurements && count($patient->measurements))
                         <thead>
@@ -426,7 +375,7 @@
                     @endif
                 </table>
             </div>
-        </div>
+        </div> --}}
 
         <hr class="m-negator mt-4 mb-3">