Show glucose meas. correctly in table & cm single table

app/Models/Client.php

@@ -894,6 +894,10 @@ SELECT m.id   AS measurement_id,
        m.value_irregular,
        m.numeric_value,
        m.effective_date,
+       m.cgm_daily_average,
+       m.cgm_max,
+       m.cgm_min,
+       m.cgm_is_daily_average,
        m.ts,
        m.has_been_stamped_by_mcp,
        m.has_been_stamped_by_rmm,
@@ -902,11 +906,11 @@ FROM measurement m
          JOIN care_month cm ON m.care_month_id = cm.id
 WHERE m.care_month_id = :careMonthID
         AND m.label NOT IN ('SBP', 'DBP')
-        AND m.bdt_measurement_id IS NOT NULL
+        AND (m.bdt_measurement_id IS NOT NULL or m.label = 'CGM')
         AND m.is_active IS TRUE
-        AND (m.is_cellular_zero = FALSE or m.is_cellular_zero IS NULL)
+        AND (m.is_cellular_zero = FALSE or m.is_cellular_zero IS NULL or m.label = 'CGM')
         AND m.ts IS NOT NULL
-        AND m.client_bdt_measurement_id IS NOT NULL
+        AND (m.client_bdt_measurement_id IS NOT NULL OR m.label = 'CGM')
 ORDER BY m.ts DESC
             ",
             ['careMonthID' => $_careMonth->id]

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

@@ -58,6 +58,8 @@ foreach ($days as $k => $day) {
                     BP
                 @elseif($m->label === 'Wt. (lbs.)')
                     Weight
+                @elseif($m->label === 'CGM')
+                    Glucose
                 @endif
             </td>
             <td class="text-nowrap">
@@ -65,6 +67,13 @@ foreach ($days as $k => $day) {
                     {{ $m->sbp_mm_hg }}/{{ $m->dbp_mm_hg }}
                 @elseif($m->label === 'Wt. (lbs.)')
                     {{ round(floatval($m->numeric_value), 2) }} lbs
+                @elseif($m->label === 'CGM')
+                    @if(!$m->cgm_is_daily_average)
+                        Min: {{$m->cgm_min ? $m->cgm_min . ' mg/dL' : '-'}}<br>
+                        Max: {{$m->cgm_max ? $m->cgm_max . ' mg/dL' : '-'}}<br>
+                    @else
+                        Avg: {{$m->cgm_daily_average ? $m->cgm_daily_average . ' mg/dL' : '-'}}
+                    @endif
                 @endif
             </td>
             <td class="d-none">

resources/views/app/patient/partials/measurement-value.blade.php

@@ -5,6 +5,13 @@
         {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }}  <span class="font-weight-normal d-inline-block pl-2">Pulse:</span> {{ $measurement->value_pulse }} @if($measurement->value_irregular === 0)<i class="ml-2 fas fa-heartbeat" title="Irregular"></i>@endif @if($measurement->value_irregular === 1)<i class="ml-2 far fa-heart" title="Regular"></i>@endif
     @elseif($measurement->label === 'Wt. (lbs.)')
         {{ round($measurement->numeric_value) }}
+    @elseif($measurement->label === 'CGM')
+        @if(!$measurement->cgm_is_daily_average)
+            Min: {{$measurement->cgm_min ? $measurement->cgm_min . ' mg/dL' : '-'}}<br>
+            Max: {{$measurement->cgm_max ? $measurement->cgm_max . ' mg/dL' : '-'}}<br>
+        @else
+            Avg: {{$measurement->cgm_daily_average ? $measurement->cgm_daily_average . ' mg/dL' : '-'}}
+        @endif
     @else
         {{ $measurement->value }}
     @endif