Dashboard - ensure measurements show manual and cellular measurements

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

@@ -173,7 +173,7 @@
                 </div>
 
                 {{-- device measurements --}}
-                @include('app/patient/partials/device-measurements')
+                {{-- @include('app/patient/partials/device-measurements') --}}
 
                 {{-- measurements --}}
                 @include('app/patient/partials/measurements')

resources/views/app/patient/partials/measurements.blade.php

@@ -1,4 +1,4 @@
-<div class="mt-2 pb-1">
+<div class="mt-2 mb-3">
     <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
         <h6 class="my-0 font-weight-bold text-secondary">Measurements</h6>
         <span class="mx-2 text-secondary">|</span>
@@ -30,7 +30,7 @@
     <table class="table table-sm border-0 m-0">
         <tbody>
         @foreach($patient->measurements as $measurement)
-            @if(!empty($measurement->label) && !in_array($measurement->label, $vitalLabels))
+            @if(1 || !empty($measurement->label) && !in_array($measurement->label, $vitalLabels))
                 <tr>
                     <td class="text-black p-0 border-0">
                         <div class="d-flex align-items-center">
@@ -69,16 +69,30 @@
                                 </form>
                             </div>
                             <span>{{ $measurement->label }}:</span>
-                            <span class="font-weight-bold ml-1">{{ $measurement->value }}</span>
+                            <span class="font-weight-bold ml-1">
+                                @if(empty($measurement->client_bdt_measurement_id))
+                                    {{ $measurement->value }}
+                                @else
+                                    @if($measurement->label === 'BP')
+                                        {{ $measurement->clientBDTMeasurement->measurement->systolic_bp_in_mm_hg }}/{{ $measurement->clientBDTMeasurement->measurement->diastolic_bp_in_mm_hg }} mmHg
+                                    @elseif($measurement->label === 'SBP')
+                                        {{ $measurement->clientBDTMeasurement->measurement->systolic_bp_in_mm_hg }} mmHg
+                                    @elseif($measurement->label === 'DBP')
+                                        {{ $measurement->clientBDTMeasurement->measurement->diastolic_bp_in_mm_hg }} mmHg
+                                    @elseif($measurement->label === 'Wt. (lbs.)')
+                                        {{ round($measurement->clientBDTMeasurement->measurement->weight_in_pounds, 1) }} lbs
+                                    @endif
+                                @endif
+                            </span>
                             <span class="font-weight-normal text-secondary ml-2 text-sm">(as on {{ friendly_date_time($measurement->effective_date, false) }})</span>
                         </div>
                     </td>
                 </tr>
             @endif
         @endforeach
-        @if(!$patient->measurements || !count($patient->measurements) === 0)
+        @if(!$patient->measurements || !count($patient->measurements))
             <tr>
-                <td class="text-secondary p-0 border-0">
+                <td class="text-secondary p-0 border-0 pl-2">
                     No items to show
                 </td>
             </tr>