Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

resources/views/app/patient/partials/rm-setup.blade.php

@@ -1,5 +1,5 @@
 <div class="row">
-    <div class="col-6">
+    <div class="col-5">
         <div class="d-flex mb-2">
           @if($pro->pro_type === 'ADMIN')
               <div class="d-flex align-items-center">
@@ -255,7 +255,7 @@
             @include('app.patient.partials.client_bp_weight_phone_number_status')
         </div>
     </div>
-    <div class="col-6 border-left">
+    <div class="col-5 border-left">
         <?php
         $bpDevice = null;
         $weightScale = null;
@@ -304,106 +304,104 @@
         ?>
 
         @if($bpDevice)
-            <div class="mb-3">
-                <div class="d-flex align-items-baseline mb-2">
-                    <span class="width-200px font-weight-bold">Cellular BP Device</span>
-                    <b class="ml-3">Yes</b>
-                    <span class="ml-3 text-secondary">IMEI: {{$bpDevice->device->imei}}</span>
-                </div>
-                <div class="">
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">Arrived:</span>
-                        <span class="ml-3">Yes</span>
-                    </div>
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">First Measurement:</span>
+            <div class="mb-2">
+                <table class="table table-sm table-bordered mb-0">
+                    <tr class="bg-light">
+                        <td class="text-secondary" style="width: 125px;">Cellular BP Device</td>
+                        <td colspan="2">Yes <i>({{$bpDevice->device->imei}})</i></td>
+                    </tr>
+                    <tr>
+                        <td class="text-secondary">Arrived</td>
+                        <td colspan="2">Yes</td>
+                    </tr>
+                    <tr>
+                        <td class="text-secondary">First Meas.</td>
                         @if($bpMeasurements["first"])
-                            <span class="ml-3">{{ $bpMeasurements["first"]->sbp_mm_hg . '/' . $bpMeasurements["first"]->dbp_mm_hg . ' mmHg' }}</span>
-                            <span class="ml-3 text-secondary">{{date("Y-m-d", $bpMeasurements["first"]->ts/1000)}}</span>
-                            <span class="ml-3">{{date_diff(date_create(date("Y-m-d", $bpMeasurements["first"]->ts/1000)), date_create('now'))->days}} days ago</span>
+                        <td class="">{{ $bpMeasurements["first"]->sbp_mm_hg . '/' . $bpMeasurements["first"]->dbp_mm_hg . '' }}</td>
+                        <td class="">{{friendly_date_short(date("Y-m-d", $bpMeasurements["first"]->ts/1000))}} <i class="text-muted">- {{date_diff(date_create(date("Y-m-d", $bpMeasurements["first"]->ts/1000)), date_create('now'))->days}} <small class="text-sm">days ago</small></i></td>
                         @else
-                            -
+                            <td colspan="3">-</td>
                         @endif
-                    </div>
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">Last Measurement:</span>
+                    </tr>
+                    <tr>
+                        <td class="text-secondary">Last Meas.</td>
                         @if($bpMeasurements["last"])
-                            <span class="ml-3">{{ $bpMeasurements["last"]->sbp_mm_hg . '/' . $bpMeasurements["last"]->dbp_mm_hg . ' mmHg' }}</span>
-                            <span class="ml-3 text-secondary">{{date("Y-m-d", $bpMeasurements["last"]->ts/1000)}}</span>
-                            <span class="ml-3">{{date_diff(date_create(date("Y-m-d", $bpMeasurements["last"]->ts/1000)), date_create('now'))->days}} days ago</span>
+                            <td>{{ $bpMeasurements["last"]->sbp_mm_hg . '/' . $bpMeasurements["last"]->dbp_mm_hg . '' }}</td>
+                            <td>{{friendly_date_short(date("Y-m-d", $bpMeasurements["last"]->ts/1000))}} <i class="text-muted">- {{date_diff(date_create(date("Y-m-d", $bpMeasurements["last"]->ts/1000)), date_create('now'))->days}} <small class="text-sm">days ago</small></i></td>
                         @else
-                            -
+                           <td colspan="3">-</td>
                         @endif
-                    </div>
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">How often to measure:</span>
-                        <span class="ml-3"> -- </span>
-                    </div>
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">SMS reminders:</span>
-                        <span class="ml-3"> -- </span>
-                    </div>
-                </div>
+                    </tr>
+                    {{--
+                    <tr>
+                        <td class="text-secondary">How often to measure</td>
+                        <td colspan="2">-</td>
+                    </tr>
+                    <tr>
+                        <td class="text-secondary">SMS reminders</td>
+                        <td colspan="2">-</td>
+                    </tr>
+                    --}}
+                </table>
             </div>
         @else
             <div class="d-flex align-items-baseline mb-3">
-                <span>Cellular BP Device</span>
+                <span class="min-width-200px">Cellular BP Device</span>
                 <b class="ml-3">No</b>
             </div>
         @endif
 
         @if($weightScale)
-            <div class="mb-3">
-                <div class="d-flex align-items-baseline mb-2">
-                    <span class="width-200px font-weight-bold">Cellular Weight Scale</span>
-                    <b class="ml-3">Yes</b>
-                    <span class="ml-3 text-secondary">IMEI: {{$weightScale->device->imei}}</span>
-                </div>
-                <div class="">
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">Arrived:</span>
-                        <span class="ml-3">Yes</span>
-                    </div>
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">First Measurement:</span>
-                        @if($weightMeasurements["first"])
-                            <span class="ml-3">{{ round($weightMeasurements["first"]->value, 2) . ' lbs' }}</span>
-                            <span class="ml-3 text-secondary">{{date("Y-m-d", $weightMeasurements["first"]->ts/1000)}}</span>
-                            <span class="ml-3">{{date_diff(date_create(date("Y-m-d", $weightMeasurements["first"]->ts/1000)), date_create('now'))->days}} days ago</span>
-                        @else
-                            -
-                        @endif
-                    </div>
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">Last Measurement:</span>
+            <div class="mb-2">
+            <table class="table table-sm table-bordered mb-0">
+                <tr class="bg-light">
+                    <td class="text-secondary">Cellular Wt. Scale</td>
+                    <td colspan="3">Yes <i>({{$weightScale->device->imei}})</i></td>
+                </tr>
+                <tr>
+                    <td class="text-secondary">Arrived</td>
+                    <td colspan="3">Yes</td>
+                </tr>
+                <tr>
+                    <td class="text-secondary">First Meas.</td>
+                    @if($weightMeasurements["first"])
+                        <td>{{ round($weightMeasurements["first"]->value, 2) . ' lbs' }}</td>
+                        <td colspan="2">{{ friendly_date_short(date("Y-m-d", $weightMeasurements["first"]->ts/1000)) }} <i class="text-muted">- {{date_diff(date_create(date("Y-m-d", $weightMeasurements["first"]->ts/1000)), date_create('now'))->days}} <small class="text-asm">days ago</small></i></td>
+                    @else
+                        <td colspan="4"></td>
+                    @endif
+                </tr>
+                <tr>
+                        <td class="text-secondary">Last Meas.</td>
                         @if($weightMeasurements["last"])
-                            <span class="ml-3">{{ round($weightMeasurements["last"]->value, 2) . ' lbs' }}</span>
-                            <span class="ml-3 text-secondary">{{date("Y-m-d", $weightMeasurements["last"]->ts/1000)}}</span>
-                            <span class="ml-3">{{date_diff(date_create(date("Y-m-d", $weightMeasurements["last"]->ts/1000)), date_create('now'))->days}} days ago</span>
+                            <td>{{ round($weightMeasurements["last"]->value, 2) . ' lbs' }}</td>
+                            <td>{{ friendly_date_short(date("Y-m-d", $weightMeasurements["last"]->ts/1000)) }} <i class="text-muted">- {{date_diff(date_create(date("Y-m-d", $weightMeasurements["last"]->ts/1000)), date_create('now'))->days}} <small class="text-sm">days ago</small></i></td>
                         @else
-                            -
+                            <td colspan="4">-</td>
                         @endif
-                    </div>
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">How often to measure:</span>
-                        <span class="ml-3"> -- </span>
-                    </div>
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="width-200px pl-3">SMS reminders:</span>
-                        <span class="ml-3"> -- </span>
-                    </div>
-                </div>
+                    </tr>
+                    {{--
+                    <tr>
+                        <td class="text-secondary">How often to measure</td>
+                        <td colspan="3">-</td>
+                    </tr>
+                    <tr>
+                        <td class="text-secondary">SMS reminders:</td>
+                        <td colspan="3">-</td>
+                    </tr>
+                    --}}
+            </table>
             </div>
         @else
             <div class="d-flex align-items-baseline mb-3">
-                <span>Cellular Weight Scale</span>
+                <span class="min-width-200px">Cellular Weight Scale</span>
                 <b class="ml-3">No</b>
             </div>
         @endif
 
         @if($careMonth && ($bpDevice || $weightScale))
             <div class="d-flex align-items-baseline mb-1">
-                <span>Measurement days this month:</span>
+                <span class="min-width-200px">Measurement days this month:</span>
                 <div class="ml-3">
                     <b>{{$careMonth->number_of_days_with_remote_measurements}} days</b>
                 </div>