Samson Mutunga преди 3 години
родител
ревизия
6749086301

+ 9 - 1
public/css/style.css

@@ -669,11 +669,16 @@ input.search_field, textarea.search_field {
         padding-top: 55px;
     }
 }
-
+.d-xlarge {
+    display: none;
+}
 @media screen and (max-width: 1400px) {
   .flex-container > div:first-child {
     margin-bottom: 20px;
   }
+  .d-xlarge {
+      display: none;
+  }
 }
 @media screen and (min-width: 1400px) {
   .flex-container{
@@ -689,6 +694,9 @@ input.search_field, textarea.search_field {
     margin-right: 20px;
     padding-right: 20px;
   }
+  .d-xlarge {
+    display: inline-block;
+}
 }
 
 .main-row > .sidebar .nav .nav-item a {

+ 1 - 1
resources/views/app/patient/note/flag-care-plan.blade.php

@@ -1,6 +1,6 @@
 
 
-	<div <?= $patient->has_care_plan_flag && !$patient->is_flag_cleared ? 'class="alert alert-danger p-1 rounded-0" style="min-width: 380px;"' : '' ?>>
+	<div <?= $patient->has_care_plan_flag && !$patient->is_flag_cleared ? 'class="alert alert-danger p-1 rounded-0" style="min-width: 380px;"' : 'class="ml-2"' ?>>
 	<?php #dump($patient); ?>
 	@if($pro->pro_type === 'ADMIN')
 		@if($patient->has_care_plan_flag && !$patient->is_flag_cleared)

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

@@ -1,135 +1,129 @@
 <div class="row" id="rm-setup">
-    <div class="col-6">
+    <div class="col-7">
         @if($pro->pro_type === 'ADMIN')
-            <div>
-                <table class="table table-sm table-striped table-bordered mb-1">
-                    <tr>
-                        <td>Is Eligible for RM?</td>
-                        <td>
-                            <div class="">
-                                <div class="d-inline-flex align-items-start">
-                                    <b>{{ ucwords($patient->is_eligible_for_rm ? $patient->is_eligible_for_rm : '-') }}</b>
-                                    <div moe class="ml-2">
-                                        <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
-                                        <form url="/api/client/updateRmEligibility" class="mcp-theme-1">
-                                            <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                            <div class="mb-2">
-                                                <label class="text-sm mb-1 text-secondary">Is Eligible?</label>
-                                                <select name="isEligibleForRm"
-                                                        class="form-control form-control-sm"
-                                                        onchange="toggleDisabledAsNeeded(this, 'NO', 'not-eligible-for-rm')">
-                                                    <option value="">-- Select Status --</option>
-                                                    <option value="YES" {{ $patient->is_eligible_for_rm === 'YES' ? 'selected' : '' }}>YES</option>
-                                                    <option value="NO" {{ $patient->is_eligible_for_rm === 'NO' ? 'selected' : '' }}>NO</option>
-                                                    <option value="UNKNOWN" {{ $patient->is_eligible_for_rm === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
-                                                </select>
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="text-sm mb-1 text-secondary">Why not eligible category</label>
-                                                <input type="text" class="not-eligible-for-rm form-control form-control-sm"
-                                                    {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
-                                                    name="whyNotEligibleForRmCategory" value="{{$patient->why_not_eligible_for_rm_category}}">
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="text-sm mb-1 text-secondary">Why not eligible memo</label>
-                                                <input type="text" class="not-eligible-for-rm form-control form-control-sm"
-                                                    {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
-                                                    name="whyNotEligibleForRmMemo" value="{{$patient->why_not_eligible_for_rm_memo}}">
-                                            </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 class="mb-2">
+                <div class="d-flex flex-wrap">
+                    <div class="d-flex align-items-center">
+                        <span class="mr-2 text-secondary">Eligible for RM?</span>
+                        <span class="mr-1">{{ ucwords($patient->is_eligible_for_rm ? $patient->is_eligible_for_rm : '-') }}</span>
+                        <div moe class="">
+                            <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                            <form url="/api/client/updateRmEligibility" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Is Eligible?</label>
+                                    <select name="isEligibleForRm"
+                                            class="form-control form-control-sm"
+                                            onchange="toggleDisabledAsNeeded(this, 'NO', 'not-eligible-for-rm')">
+                                        <option value="">-- Select Status --</option>
+                                        <option value="YES" {{ $patient->is_eligible_for_rm === 'YES' ? 'selected' : '' }}>YES</option>
+                                        <option value="NO" {{ $patient->is_eligible_for_rm === 'NO' ? 'selected' : '' }}>NO</option>
+                                        <option value="UNKNOWN" {{ $patient->is_eligible_for_rm === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                                    </select>
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Why not eligible category</label>
+                                    <input type="text" class="not-eligible-for-rm form-control form-control-sm"
+                                        {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
+                                        name="whyNotEligibleForRmCategory" value="{{$patient->why_not_eligible_for_rm_category}}">
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Why not eligible memo</label>
+                                    <input type="text" class="not-eligible-for-rm form-control form-control-sm"
+                                        {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
+                                        name="whyNotEligibleForRmMemo" value="{{$patient->why_not_eligible_for_rm_memo}}">
+                                </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>
+                        @if($patient->is_eligible_for_rm === 'NO')
+                        <span class="ml-1 on-hover-show d-inline-block on-hover-opaque">
+                            <i class="fa fa-info-circle"></i>
+                            <div class="on-hover-content py-2 pl-3 text-nowrap text-dark" style="left:0;right:auto;">
+                                <div>
+                                    <small class="text-sm"><b>Category:</b> {{$patient->why_not_eligible_for_rm_category ?: '-'}}</small>
+                                </div>
+                                <div>
+                                    <small class="text-sm"><b>Memo:</b> {{$patient->why_not_eligible_for_rm_memo ?: '-'}}</small>
                                 </div>
-                                @if($patient->is_eligible_for_rm === 'NO')
-                                    <div class="mt-1">
-                                        <span>{{$patient->why_not_eligible_for_rm_category ?: '-'}}</span>
-                                        /
-                                        <span class="text-secondary">{{$patient->why_not_eligible_for_rm_memo ?: '-'}}</span>
-                                    </div>
-                                @endif
                             </div>
-                        </td>
-                    </tr>
+                        </span>
+                        @endif
+                    </div>
+                    <span class="text-secondary mx-2">|</span>
                     <?php $currentCareMonth = $patient->currentCareMonth(); ?>
                     @if($currentCareMonth && $pro->id === $currentCareMonth->mcp_pro_id)
                     <?php $spoken = $currentCareMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
-                        <tr>
-                            <td>
-                            Comm. this month:
-                            </td>
-                            <td>
-                                <b class="{{$spoken ? 'text-success' : ''}}">
-                                    {{$spoken ? 'Yes' : 'No'}}
-                                    @if(!$spoken)
-                                        <i class="fa fa-exclamation-triangle"></i>
-                                    @else
-                                        <i class="fa fa-check"></i>
-                                    @endif
-                                </b>
-                                @if($currentCareMonth->mcp && $pro->id === $currentCareMonth->mcp->id)
-                                    <div moe relative class="ml-2">
-                                        <a href="#" start show class="">Toggle</a>
-                                        <form url="/api/careMonth/setHasAnyoneInteractedWithClientAboutRmOutsideNoteTo{{$spoken ? 'False' : 'True'}}" right>
-                                            <input type="hidden" name="uid" value="{{$currentCareMonth->uid}}">
-                                            <p>Set to {{$spoken ? 'No' : 'Yes'}}?</p>
-                                            <div class="d-flex align-items-center">
-                                                <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                            </div>
-                                        </form>
+                    <div class="d-flex align-items-center">
+                        <span class="mr-1 text-secondary">Comm. this month:</span>
+                        <span class="{{$spoken ? 'text-success' : ''}}">
+                            {{$spoken ? 'Yes' : 'No'}}
+                            @if(!$spoken)
+                                <i class="fa fa-exclamation-triangle"></i>
+                            @else
+                                <i class="fa fa-check"></i>
+                            @endif
+                        </span>
+                        @if($currentCareMonth->mcp && $pro->id === $currentCareMonth->mcp->id)
+                            <div moe relative class="ml-1">
+                                <a href="#" start show class=""><i class="fa fa-edit on-hover-opaque"></i></a>
+                                <form url="/api/careMonth/setHasAnyoneInteractedWithClientAboutRmOutsideNoteTo{{$spoken ? 'False' : 'True'}}" right>
+                                    <input type="hidden" name="uid" value="{{$currentCareMonth->uid}}">
+                                    <p>Set to {{$spoken ? 'No' : 'Yes'}}?</p>
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                     </div>
-                                @endif
-                            </td>
-                        </tr>
+                                </form>
+                            </div>
+                        @endif
+                    </div>
+                    <span class="text-secondary mx-2 d-xlarge">|</span>
                     @endif
-                    <tr>
-                        <td>Enrollment:</td>
-                        <td>
-                            <div class="">
-                                <div class="d-inline-flex align-items-start">
-                                    <b>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</b>
-                                    @if($patient->is_enrolled_in_rm === 'YES')
-                                        <div moe class="ml-2">
-                                            <a start show>Toggle</a>
-                                            <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
-                                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                <p>Un-enroll from RPM?</p>
-                                                <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>
-                                    @else
-                                        <a native target="_blank"
-                                        class="screen-only ml-2"
-                                        open-in-stag-popup
-                                        popup-style="medium overflow-visible"
-                                        mc-initer="rpm-agreement-{{$note->id}}"
-                                        title="Leadership Health Remote Patient Monitoring Consent Form"
-                                        href="/note/rpm-agreement/{{$note->uid}}?popupmode=1">
-                                            Mark as enrolled
-                                        </a>
-                                    @endif
-                                </div>
+
+                    <div class="d-flex align-items-center">
+                        <span class="mr-1 text-secondary">Enrollment:</span>
+                        <span>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</span>
+                        @if($patient->is_enrolled_in_rm === 'YES')
+                            <div moe class="ml-1">
+                                <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                                <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
+                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                    <p>Un-enroll from RPM?</p>
+                                    <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>
-                        </td>
-                    </tr>
-                </table>
+                        @else
+                            <a native target="_blank"
+                            class="screen-only ml-2"
+                            open-in-stag-popup
+                            popup-style="medium overflow-visible"
+                            mc-initer="rpm-agreement-{{$note->id}}"
+                            title="Leadership Health Remote Patient Monitoring Consent Form"
+                            href="/note/rpm-agreement/{{$note->uid}}?popupmode=1">
+                                Mark as enrolled
+                            </a>
+                        @endif
+                    </div>
+                </div>
+                
             </div> 
         @endif
         
-        <div class="d-flex align-items-baseline mb-3">
+        <div class="d-flex align-items-baseline mb-1">
             <div class="flex-grow-1">
                 <div>
                     <div class="d-flex align-items-center mb-1">
-                        <span class="mr-2">RM Reasons:</span>
+                        <span class="mr-2 text-secondary">RM Reasons:</span>
                         @include('app.patient.partials.put-rm-reasons', ['recordType' => 'CLIENT', 'record' => $patient])
                     </div>
-                    <div class="">
+                    <div class="pl-3">
                         @include('app.patient.partials.rm-reasons-display', ['recordType' => 'CLIENT', 'record' => $patient])
                     </div>
                 </div>
@@ -234,11 +228,12 @@
                 </div>--}}
             </div>
         </div>
-        <div class="mb-3">
-            <table class="table-sm table-striped table-bordered w-100 v-top">
+        <div class="my-2">
+            <table class="table-sm table-bordered v-top">
                 <tr>
-                    <td>Care Plan:</td>
+                    <td class="text-secondary">Care Plan:</td>
                     <td>
+                        <div class="{{ $patient->has_care_plan_flag && !$patient->is_flag_cleared ? '':'d-flex' }}">
                         <div class="d-inline-flex align-items-center">
                             @if($patient->has_cm_setup_been_performed)
                                 <div class="text-nowrap text-success">
@@ -330,6 +325,7 @@
                             </div>
                         @endif
                         @include('app.patient.note.flag-care-plan')
+                        </div>
                     </td>
                 </tr>
             </table>
@@ -339,10 +335,10 @@
 
         @if($pro->pro_type === 'ADMIN')
             <div>
-                <table class="table table-sm table-bordered table-striped">
+                <table class="table-sm ">
                     <tr>
-                        <td>RME Pro:</td>
-                        <td>
+                        <td class="text-secondary p-1">RME Pro:</td>
+                        <td class="p-1">
                             <div class="">
                                 <div class="d-inline-flex align-items-start">
                                     <b>{{ $patient->rme ? $patient->rme->displayName() : '-' }}</b>
@@ -380,8 +376,8 @@
                         </td>
                     </tr>
                     <tr>
-                        <td>RMM Pro:</td>
-                        <td>
+                        <td class="text-secondary p-1">RMM Pro:</td>
+                        <td class="p-1">
                             <div class="">
                                 <div class="d-inline-flex align-items-start">
                                     <b>{{ $patient->rmm ? $patient->rmm->displayName() : '-' }}</b>
@@ -421,12 +417,12 @@
                 </table>
             </div>
         @endif
-        <div class="border-top mt-2 pt-2">
+        <div class="border-top mt-1 pt-2">
             @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;

+ 7 - 7
resources/views/app/patient/partials/client_bp_weight_phone_number_status.blade.php

@@ -30,29 +30,29 @@
         </span>
         
     </div>
-    <table class="table table-sm table-striped table-bordered">
+    <table class="table-sm table-bordered">
         <tr>
-            <td>Cardio1st BP sms number:</td>
+            <td class="text-secondary">Cardio1st BP sms number:</td>
             <td>{{config('app.bpSmsNumber')}}</td>
         </tr>
         <tr>
-            <td>Cardio1st Weight sms number:</td>
+            <td class="text-secondary">Cardio1st Weight sms number:</td>
             <td>{{config('app.weightSmsNumber')}}</td>
         </tr>
         <tr>
-            <td>Has client saved BP phone number:</td>
+            <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>Saved BP Phone number:</td>
+            <td class="text-secondary">Saved BP Phone number:</td>
             <td>{{ $patient->clientBpWeightPhoneNumberStatus ?  $patient->clientBpWeightPhoneNumberStatus->saved_bp_phone_number: '-'}}</td>
         </tr>
         <tr>
-            <td>Has client saved Weight phone number:</td>
+            <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>Saved Weight Phone number:</td>
+            <td class="text-secondary">Saved Weight Phone number:</td>
             <td>{{ $patient->clientBpWeightPhoneNumberStatus ? $patient->clientBpWeightPhoneNumberStatus->saved_weight_phone_number : '-' }}</td>
         </tr>
     </table>

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

@@ -38,11 +38,13 @@ $displayData = [
 			@endif
 		@endforeach
 		@if($emptyICDs)
-		<small class="text-dark">-</small>
+		<small class="text-dark"></small>
 		@endif
 	</div>
+	@if($record->rm_reason_memo)
 	<div class="d-flex">
-			<span class="mr-2"><b>Memo:</b></span>
-			<small class="text-muted">{{ $record->rm_reason_memo }}</small>
+			<span class="text-secondary mr-2"><b>Memo:</b></span>
+			<small class="">{{ $record->rm_reason_memo }}</small>
 	</div>
+	@endif
 </div>