Patient > devices - clean up

app/Models/ClientBDTDevice.php

@@ -15,12 +15,15 @@ class ClientBDTDevice extends Model
     }
 
     public function lastDeviceMeasurement() {
-        return BDTMeasurement::select('bdt_measurement.*')
-        ->join('client_bdt_measurement', 'client_bdt_measurement.bdt_measurement_id','=', 'bdt_measurement.id')
-        ->where('client_bdt_measurement.client_id', $this->client_id)
-        ->where('bdt_measurement.imei', $this->device->imei)
-        ->orderBy('bdt_measurement.created_at', 'DESC')
-        ->first();
+        return BDTMeasurement::select('bdt_measurement.created_at', 'measurement.label', 'measurement.sbp_mm_hg', 'measurement.dbp_mm_hg', 'measurement.numeric_value')
+            ->join('client_bdt_measurement', 'client_bdt_measurement.bdt_measurement_id', '=', 'bdt_measurement.id')
+            ->join('measurement', 'measurement.client_bdt_measurement_id', '=', 'client_bdt_measurement.id')
+            ->where('bdt_measurement.is_cellular_zero', '<>', true)
+            ->whereNotNull('bdt_measurement.ts')
+            ->where('client_bdt_measurement.client_id', $this->client_id)
+            ->where('bdt_measurement.imei', $this->device->imei)
+            ->orderBy('bdt_measurement.created_at', 'DESC')
+            ->first();
     }
 
 }

resources/views/app/patient/devices.blade.php

@@ -65,24 +65,23 @@
                         <td class="px-2">{{ $device->device->category }}</td>
                         <td class="px-2"><pre class="m-0">{{ $device->device->imei }}</pre></td>
                         <td class="px-2">
-                            @if($device->lastDeviceMeasurement())
-                                <div>
-                                <i class="far fa-calendar-check"></i> {{ friendly_date_time($device->lastDeviceMeasurement()->created_at) }}
-                                </div>
-                                <?php $measurement = $device->lastDeviceMeasurement(); ?>
-                                @if($measurement->is_cellular_zero)
+                            <?php $lastMeasurement = $device->lastDeviceMeasurement(); ?>
+                            @if($lastMeasurement)
+                                @if($lastMeasurement->is_cellular_zero)
                                     <i class="font-size-11 fa fa-rss"></i>
-                                @elseif($measurement->label === 'BP')
-                                    {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mmHg  <span class="font-weight-normal d-inline-block pl-2">Pulse:</span> {{ $measurement->value_pulse }} {{ $measurement->value_irregular === 0?'Irregular':'' }} {{ $measurement->value_irregular === 1?'Regular':'' }}
-                                @elseif($measurement->label === 'Wt. (lbs.)')
-                                    {{ $measurement->numeric_value }} lbs
+                                @elseif($lastMeasurement->label === 'BP')
+                                    {{ $lastMeasurement->sbp_mm_hg }} / {{ $lastMeasurement->dbp_mm_hg }}
+                                @elseif($lastMeasurement->label === 'Wt. (lbs.)')
+                                    {{ round($lastMeasurement->numeric_value, 2) }} lbs
                                 @else
-                                    {{ $measurement->value }}
+                                    {{ $lastMeasurement->value }}
                                 @endif
+                                <div>
+                                    <i class="far fa-calendar-check"></i> <span class="text-secondary">{{ friendly_date_time($lastMeasurement->created_at) }}</span>
+                                </div>
                             @else
-                                <small class="text-muted">No</small>
+                                <small class="text-muted">-</small>
                             @endif
-                            
                         </td>
                         <td>
                             <div moe relative>