Fixes

app/Helpers/helpers.php

@@ -885,3 +885,9 @@ if(!function_exists('get_doc_templates')){
         return $templates;
     }
 }
+if(!function_exists('format_phone_number')) {
+    function format_phone_number($number, $default = '-') {     
+        if(empty($number)) return $default;   
+        return preg_replace('~.*(\d{3})[^\d]{0,7}(\d{3})[^\d]{0,7}(\d{4}).*~', '($1) $2-$3', $number). "\n";
+    }
+}

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 84,
+    'asset_version' => 85,
 
     'temp_dir' => env('TEMP_DIR'),
 

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

@@ -471,46 +471,45 @@
         ?>
 
         @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 . '' }}</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 . '' }}</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">
@@ -520,46 +519,45 @@
         @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">

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

@@ -1,59 +1,54 @@
 <div class="">
     <div class="mb-1">
-        <span class="mb-0 mr-2"><b>Please ask the client to save the following numbers for receiving measurement SMS messages.</b>
-        <div moe>
-            <a start show><i class="fa fa-edit"></i></a>
-            <form url="/api/client/updateClientBpWeightPhoneNumberStatus" class="mcp-theme-1">
-                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                <div class="mb-2 checkbox">
-                    <input type="checkbox" name="hasClientSavedBpPhoneNumber">
-                    <label class="mb-1 text-secondary text-sm">Has client saved bp phone number?</label>
-                </div>
-                <div class="mb-2">
-                    <label class="mb-1 text-secondary text-sm">Saved BP phone number</label>
-                    <input type="text" name="savedBpPhoneNumber" class="form-control form-control-sm" value="{{config('app.bpSmsNumber')}}">
-                </div>
-                <div class="mb-2 checkbox">
-                    <input type="checkbox" name="hasClientSavedWeightPhoneNumber">
-                    <label class="mb-1 text-secondary text-sm">Has client saved weight phone number?</label>
-                </div>
-                <div class="mb-2">
-                    <label class="mb-1 text-secondary text-sm">Saved weight phone number</label>
-                    <input type="text" name="savedWeightPhoneNumber" class="form-control form-control-sm" value="{{config('app.weightSmsNumber')}}">
-                </div>
-                <div>
-                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                </div>
-            </form>
+        <div>
+            <p class="mb-1 text-secondary"><b>Please ask patient to store the following phone numbers for Cardio1st notifications:</b></p>
+            <p class="mb-1"><b>BP</b> {{ format_phone_number(config('app.bpSmsNumber')) }} <b class="ml-2">WT</b> {{ format_phone_number(config('app.weightSmsNumber')) }}</p>
+        </div>
+        <div class="d-flex align-items-center">
+            <p class="mb-0 mr-2 text-secondary">Has patient stored #s?</p>
+            <span class="mr-2">
+                @if($patient->clientBpWeightPhoneNumberStatus->has_client_saved_bp_phone_number)
+                <i class="fas fa-check-square text-success on-hover-opaque"></i>
+                @else
+                <i class="far fa-square text-secondary on-hover-opaque"></i>
+                @endif
+                BP
+            </span>
+            <span class="mr-2">
+                @if($patient->clientBpWeightPhoneNumberStatus->has_client_saved_weight_phone_number)
+                <i class="fas fa-check-square text-success on-hover-opaque"></i>
+                @else
+                <i class="far fa-square text-secondary on-hover-opaque"></i>
+                @endif
+                WT
+            </span>
+            
+            <div moe>
+                <a start show><i class="fa fa-edit"></i></a>
+                <form url="/api/client/updateClientBpWeightPhoneNumberStatus" class="mcp-theme-1">
+                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                    <div class="mb-2 checkbox">
+                        <input type="checkbox" name="hasClientSavedBpPhoneNumber" <?= $patient->clientBpWeightPhoneNumberStatus->has_client_saved_bp_phone_number ? 'checked':'' ?>>
+                        <label class="mb-1 text-secondary text-sm">Has client saved bp phone number?</label>
+                    </div>
+                    <div class="mb-2 d-none">
+                        <label class="mb-1 text-secondary text-sm">Saved BP phone number</label>
+                        <input type="text" name="savedBpPhoneNumber" class="form-control form-control-sm" value="{{ format_phone_number(config('app.bpSmsNumber')) }}">
+                    </div>
+                    <div class="mb-2 checkbox">
+                        <input type="checkbox" name="hasClientSavedWeightPhoneNumber" <?= $patient->clientBpWeightPhoneNumberStatus->has_client_saved_weight_phone_number ? 'checked':'' ?>>
+                        <label class="mb-1 text-secondary text-sm">Has client saved weight phone number?</label>
+                    </div>
+                    <div class="mb-2 d-none">
+                        <label class="mb-1 text-secondary text-sm">Saved weight phone number</label>
+                        <input type="text" name="savedWeightPhoneNumber" class="form-control form-control-sm" value="{{ format_phone_number(config('app.weightSmsNumber')) }}">
+                    </div>
+                    <div>
+                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                    </div>
+                </form>
+            </div>
         </div>
-        </span>
-        
     </div>
-    <table class="table-sm table-bordered">
-        <tr>
-            <td class="text-secondary">Cardio1st BP sms number:</td>
-            <td>{{config('app.bpSmsNumber')}}</td>
-        </tr>
-        <tr>
-            <td class="text-secondary">Cardio1st Weight sms number:</td>
-            <td>{{config('app.weightSmsNumber')}}</td>
-        </tr>
-        <tr>
-            <td class="text-secondary">Has client saved BP phone number:</td>
-            <td>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->has_client_saved_bp_phone_number ? 'Yes': 'No' }}</td>
-        </tr>
-        <tr>
-            <td class="text-secondary">Saved BP Phone number:</td>
-            <td>{{ $patient->clientBpWeightPhoneNumberStatus ?  $patient->clientBpWeightPhoneNumberStatus->saved_bp_phone_number: '-'}}</td>
-        </tr>
-        <tr>
-            <td class="text-secondary">Has client saved Weight phone number:</td>
-            <td>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->has_client_saved_weight_phone_number ? 'Yes': 'No' }}</td>
-        </tr>
-        <tr>
-            <td class="text-secondary">Saved Weight Phone number:</td>
-            <td>{{ $patient->clientBpWeightPhoneNumberStatus ? $patient->clientBpWeightPhoneNumberStatus->saved_weight_phone_number : '-' }}</td>
-        </tr>
-    </table>
 </div>

resources/views/app/patient/partials/rm-reasons-display.blade.php

@@ -34,7 +34,7 @@ $displayData = [
 			}
 			?>
 			@if(!$emptyICD)
-				<span class="mb-1 mr-2"><i class="fas fa-star text-warning"></i> {{$rmData['reason']}} @if(!empty($rmData['description']))({{ $rmData['description'] }})@endif</span>
+				<span class="mb-1 mr-2 d-flex align-items-center"><i class="fas fa-circle text-muted mr-1" style="font-size: 5px;"></i> {{$rmData['reason']}} @if(!empty($rmData['description']))({{ $rmData['description'] }})@endif</span>
 			@endif
 		@endforeach
 		@if($emptyICDs)