merged

app/Helpers/helpers.php

@@ -362,6 +362,20 @@ if(!function_exists('friendly_date')) {
     }
 }
 
+if(!function_exists('friendly_date_short')) {
+    function friendly_date_short($value) {
+        if(!$value || empty($value)) return '';
+        try {
+            $result = strtotime($value);
+            $result = date("m/d/y", $result);
+            return $result;
+        }
+        catch (Exception $e) {
+            return $value;
+        }
+    }
+}
+
 if(!function_exists('friendly_date_month_year')) {
     function friendly_date_month_year($value) {
         if(!$value || empty($value)) return '';

config/app.php

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

resources/views/layouts/patient-header.blade.php

@@ -37,6 +37,14 @@ $addressParts .= implode(", ", $addressPart2);
   .patient-header label {
     margin-bottom: 0 !important;
   }
+<<<<<<< HEAD
+=======
+  @media screen and (max-width:1400px){
+    .header-coverage-status {
+      max-width:305px;
+    }
+  }
+>>>>>>> 6c7a3450e2d64ac996abb3a9912780215b13bf13
 </style>
 <div class="p-2 mcp-theme-1 patient-header">
   @if($patient->is_duplicate)
@@ -70,6 +78,7 @@ $addressParts .= implode(", ", $addressPart2);
         </span>
       </h6>
       <div class="d-flex border-left pl-2 ml-2">
+<<<<<<< HEAD
         <div class="mr-2">Cell. BP: <b>{{$patient->hasBPDevice()?'Yes':'No'}}</b></div>
         @if($patient->most_recent_cellular_bp_sbp_mm_hg && $patient->most_recent_cellular_bp_dbp_mm_hg)
         <div class="mr-2">Last BP:
@@ -88,12 +97,32 @@ $addressParts .= implode(", ", $addressPart2);
           @endif
         </div>
         @endif
+=======
+        <div class="mr-1">Cell. BP: <b>{{$patient->hasBPDevice()?'Yes':'No'}}</b>
+          @if($patient->most_recent_cellular_bp_sbp_mm_hg && $patient->most_recent_cellular_bp_dbp_mm_hg)
+          (<b>{{$patient->most_recent_cellular_bp_sbp_mm_hg ?: '-'}}/{{$patient->most_recent_cellular_bp_dbp_mm_hg ?: '-'}}</b>@if($patient->most_recent_cellular_bp_measurement_at),{{friendly_date_short($patient->most_recent_cellular_bp_measurement_at)}} @endif)
+          @endif
+        </div>
+        <div class="mr-2">Wt.: <b>{{$patient->hasWeightScaleDevice()?'Yes':'No'}}</b>
+          @if($patient->most_recent_cellular_weight_value)
+          (
+            <b>{{round($patient->most_recent_cellular_weight_value, 1)}}</b>@if($patient->most_recent_cellular_weight_measurement_at),{{friendly_date_short($patient->most_recent_cellular_weight_measurement_at)}}
+            @endif
+          )
+          @endif
+        </div>
+        
+>>>>>>> 6c7a3450e2d64ac996abb3a9912780215b13bf13
 
         <?php $currentCareMonth = $patient->currentCareMonth(); ?>
         @if($currentCareMonth && ($pro->pro_type === 'ADMIN' || $pro->id === $currentCareMonth->mcp_pro_id))
         <div class="text-primary c-pointer" open-in-stag-popup mc-initer="care-month-dashboard-{{$patient->uid}}" title="Care Month: {{friendly_month($currentCareMonth->start_date)}}" popup-style="overflow-visible" href="/patients/view/{{ $patient->uid }}/care-months/view/{{$currentCareMonth->uid}}">
           <?php $spoken = $currentCareMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
+<<<<<<< HEAD
           <span class="">RPM comm. this month:</span>
+=======
+          <span class="">RPM comm. this mt:</span>
+>>>>>>> 6c7a3450e2d64ac996abb3a9912780215b13bf13
           <b class="{{$spoken ? 'text-success' : ''}}">
             {{$spoken ? 'Yes' : 'No'}}
             @if(!$spoken)
@@ -153,11 +182,19 @@ $addressParts .= implode(", ", $addressPart2);
       </div>
       @if($performer->pro->pro_type == 'ADMIN')
       <div>
+<<<<<<< HEAD
         <a href="#" start class="ml-3 mt-1 d-block" show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye mr-1"></i></a>
       </div>
       @endif
       <div>
         <a href="#" start class="ml-3 mt-1 d-block" show onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i class="fa fa-video mr-1"></i></a>
+=======
+        <a href="#" start class="ml-3 d-block" show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye mr-1"></i></a>
+      </div>
+      @endif
+      <div>
+        <a href="#" start class="ml-3 d-block" show onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i class="fa fa-video mr-1"></i></a>
+>>>>>>> 6c7a3450e2d64ac996abb3a9912780215b13bf13
       </div>
     </div>
   </div>
@@ -206,7 +243,11 @@ $addressParts .= implode(", ", $addressPart2);
             @endif
           </div>
 
+<<<<<<< HEAD
           <div class="mt-1">
+=======
+          <div class="">
+>>>>>>> 6c7a3450e2d64ac996abb3a9912780215b13bf13
             @if($patient->has_mcp_done_onboarding_visit !== 'YES')
             <span class="text-dark d-inline-flex align-items-center">
               <span class="mr-2">
@@ -261,7 +302,11 @@ $addressParts .= implode(", ", $addressPart2);
           </div>
         </div>
         @if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
+<<<<<<< HEAD
         <div class="my-1">
+=======
+        <div class="">
+>>>>>>> 6c7a3450e2d64ac996abb3a9912780215b13bf13
           <label>Follow-up Freq (days):</label>
           <span>{!! is_null($patient->mcp_usual_follow_up_frequency_in_days) ? '<span class="text-danger">Not Set</span>' : $patient->mcp_usual_follow_up_frequency_in_days !!}</span>
           <div moe relative class="ml-2">
@@ -299,7 +344,11 @@ $addressParts .= implode(", ", $addressPart2);
 
 
     @if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
+<<<<<<< HEAD
     <div class="d-flex bg-light p-2 border">
+=======
+    <div class="d-flex bg-light p-2 border header-coverage-status">
+>>>>>>> 6c7a3450e2d64ac996abb3a9912780215b13bf13
       @include('app.patient.coverage-status')
     </div>
     @endif
@@ -443,7 +492,7 @@ $addressParts .= implode(", ", $addressPart2);
         <form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->defaultNaPro->uid}}';" method="POST" target="_top" class="d-inline-block">
           @csrf
           <input type="hidden" name="proUid" value="{{$patient->defaultNaPro->uid}}">
-          <button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user"></i></button>
+          <button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user on-hover-opaque"></i></button>
         </form>
         @endif
       </div>
@@ -488,10 +537,14 @@ $addressParts .= implode(", ", $addressPart2);
       @endif
     </div>
 
+<<<<<<< HEAD
     <div class="bg-light p-2 border max-width-300px">
+=======
+    <div class="bg-light p-2 border" style="max-width: 215px;">
+>>>>>>> 6c7a3450e2d64ac996abb3a9912780215b13bf13
       <div>
-        <div class="max-width-300px d-flex">
-          <label class="mb-1">Sticky Note:</label>
+        <div class="d-flex">
+          <label class="">Sticky Note:</label>
           <div moe relative wide class="ml-2 hide-inside-popup">
             <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
             <form url="/api/client/updateStickyNote" class="mcp-theme-1" right>
@@ -511,7 +564,7 @@ $addressParts .= implode(", ", $addressPart2);
           </div>
         </div>
         @if($patient->sticky_note)
-        <div class="mb-2">
+        <div class="">
           <span class="d-block text-secondary">{{$patient->sticky_note ?? '-' }}</span>
         </div>
         @endif
@@ -525,7 +578,7 @@ $addressParts .= implode(", ", $addressPart2);
     </div>
     <div class="bg-light p-2 border">
       <ul class="vbox align-self-start patient-header-address mb-0">
-        <li class="mb-1 d-flex align-items-start">
+        <li class="d-flex align-items-start">
           <span class="aligned-icon">
             <i class="fa fa-map-marker-alt" aria-hidden="true"></i>
           </span>
@@ -554,7 +607,7 @@ $addressParts .= implode(", ", $addressPart2);
           </div>
         </li>
         @if($patient->cell_number)
-        <li class="mb-1">
+        <li class="">
           <span class="aligned-icon">
             <i class="fa fa-phone-alt" aria-hidden="true"></i>
           </span>
@@ -565,12 +618,12 @@ $addressParts .= implode(", ", $addressPart2);
         </li>
         @endif
         @if($patient->phone_home)
-        <li class="mb-1">
+        <li class="">
           <span class="aligned-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
           {{$patient->phone_home}}
         </li>
         @endif
-        <li class="mb-1 d-flex align-items-start">
+        <li class="d-flex align-items-start">
           <div class="d-flex align-items-center flex-wrap">
             <span class="ml-1 mr-2"><i class="fa fa-envelope"></i>
               @if($hasConfirmedEmail)