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

public/css/style.css

@@ -115,7 +115,7 @@ main {
   gap: 10px;
 }
 .flex-header >div {
-  /* flex-grow: 1; */
+  flex-grow: 1;
 }
 .patient-header-address {
   list-style-type: none;

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

@@ -7,7 +7,7 @@
     @if($coverageStatus === 'YES')
         <i class="fa fa-check-circle text-success"></i>
     @elseif($coverageStatus === 'NO')
-        @if(!$coverage->manual_determination_category)
+        @if($coverage && !$coverage->manual_determination_category)
             <i class="fas fa-hourglass-half text-warning" title="Pending Validation"></i>
         @else
             <i class="fa fa-times text-danger"></i>

resources/views/app/patient/note/dashboard-bu-b4-pure-soap.blade.php

@@ -1068,11 +1068,11 @@
                                         }
                                     ?>
                                     @if(!$emptyICD)
-                                        <span class="badge badge-info px-2 mb-1 mr-2">{{$noteICD['description']}} ({{ $noteICD['reason'] }})</span>
+                                    <span class="badge badge-info px-2 mb-1 mr-2">{{$noteICD['reason']}} @if(!empty($noteICD['description']))({{ $noteICD['description'] }})@endif</span>
                                     @endif
                                 @endforeach
                             @if($emptyNoteICDs)
-                                <small class="text-warning">No note reasons</small>
+                                <small class="text-dark">-</small>
                             @endif
                         </div>
                     </div>

resources/views/app/patient/note/dashboard-univ.blade.php

@@ -901,11 +901,11 @@
                                                 }
                                             ?>
                                             @if(!$emptyICD)
-                                                <span class="badge badge-info px-2 mb-1 mr-2">{{$noteICD['description']}} ({{ $noteICD['reason'] }})</span>
+                                            <span class="badge badge-info px-2 mb-1 mr-2">{{$noteICD['reason']}} @if(!empty($noteICD['description']))({{ $noteICD['description'] }})@endif</span>
                                             @endif
                                         @endforeach
                                     @if($emptyNoteICDs)
-                                        <small class="text-warning">No note reasons</small>
+                                        <small class="text-dark">-</small>
                                     @endif
                                 </div>
                             </div>

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

@@ -1119,11 +1119,11 @@ use App\Models\Handout;
                                         }
                                     ?>
                                     @if(!$emptyICD)
-                                        <span class="badge badge-info px-2 mb-1 mr-2">{{$noteICD['description']}} ({{ $noteICD['reason'] }})</span>
+                                        <span class="badge badge-info px-2 mb-1 mr-2">{{$noteICD['reason']}} @if(!empty($noteICD['description']))({{ $noteICD['description'] }})@endif</span>
                                     @endif
                                 @endforeach
                             @if($emptyNoteICDs)
-                                <small class="text-warning">No note reasons</small>
+                                <small class="text-dark">-</small>
                             @endif
                         </div>                        
                     </div>

resources/views/app/patient/note/rpm-agreement.blade.php

@@ -43,8 +43,8 @@
     <?php $patient = $note->client; ?>
 
     <div class="border rounded p-3 mb-3 max-width-500px" id="rpm-agreement-reasons-{{$note->id}}">
-        <div class="d-flex align-items-center">
-            <p class="mb-0 mr-2"><b>RPM Reasons</b></p>
+        <div class="d-flex align-items-center mb-2">
+            <p class="mb-0 mr-2"><b>RM Reasons</b></p>
             <div>@include('app.patient.partials.put-rm-reasons', ['recordType' => 'CLIENT', 'record' => $patient])</div>
         </div>
         <div class="max-width-500px">

resources/views/app/patient/primary-coverage-manual-determination-medicaid-modal.blade.php

@@ -3,12 +3,17 @@
 	$cpc = $patient->latestClientPrimaryCoverage;
 	@endphp
 	<div class="p-3">
-		@if($cpc->mcd_number)
-		<div class="mb-2">
-			<span><b>Medicaid Number:</b> {{$cpc->mcd_number}}</span>
-			<span class="ml-3"><b>Medicaid State:</b> {{$cpc->mcd_payer_id ? $cpc->mcdPayer->name : '-'}}</span>
+		<div class="d-flex flex-wrap">
+			@if($cpc->mcd_number)
+			<div class="mb-2">
+				<span><b>Medicaid Number:</b> {{$cpc->mcd_number}}</span>
+				<span class="ml-3"><b>Medicaid State:</b> {{$cpc->mcd_payer_id ? $cpc->mcdPayer->name : '-'}}</span>
+			</div>
+			@endif
+			<div class="mb-2 mr-2">
+				<span><b>Is Covered:</b> {{$cpc->is_covered}}</span>
+			</div>
 		</div>
-		@endif
 		<form @submit.prevent="submitForm" method="post" class="mcp-theme-1">
 			<input type="hidden" name="clientPrimaryCoverageUid" value="{{$cpc->uid}}" class="form-control input-sm" />
 			<div class="row">

resources/views/app/patient/primary-coverage-manual-determination-medicare-modal.blade.php

@@ -3,11 +3,16 @@
 	$cpc = $patient->latestClientPrimaryCoverage;
 	@endphp
 	<div class="p-3">
-		@if($cpc->mcr_number)
-		<div class="mb-2">
-			<b>Medicare Number:</b> {{$cpc->mcr_number}}
+		<div class="d-flex flex-wrap">
+			@if($cpc->mcr_number)
+			<div class="mb-2">
+				<b>Medicare Number:</b> {{$cpc->mcr_number}}
+			</div>
+			@endif
+			<div class="mb-2 mr-2">
+				<span><b>Is Covered:</b> {{$cpc->is_covered}}</span>
+			</div>
 		</div>
-		@endif
 		<form @submit.prevent="submitForm" method="post" class="mcp-theme-1">
 			<input type="hidden" name="clientPrimaryCoverageUid" value="{{$cpc->uid}}" class="form-control input-sm" />
 			<div class="row">

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

@@ -166,9 +166,116 @@ $addressParts .= implode(", ", $addressPart2);
       </div> -->
       <div class="position-relative ml-2">
         <div class="screen-only">
+          <div>
+            <label>MCP:</label> {{$mcpName}} 
+            @if($patient->has_mcp_done_onboarding_visit === 'YES')
+              <i class="fa fa-check text-sm" title="MCP Onboarding Visit Completed"></i>
+            @endif
+            @if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
+            <div moe class="ml-2 hide-inside-popup">
+              <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+              <form url="/api/client/putMcp" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <label class="text-secondary text-sm">MCP Pro</label>
+                  <select name="mcpProUid" provider-search data-pro-uid="{{ @$patient->mcp->uid }}" class="form-control form-control-sm">
+                    <option value=""> --select--</option>
+                    @foreach($pros as $iPro)
+                    <option value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                    @endforeach
+                  </select>
+                </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->mcp)
+            <div moe class="ml-2 hide-inside-popup">
+              <a start show><i class="fa fa-times on-hover-opaque"></i></a>
+              <form url="/api/client/removeMcp" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <label class="text-secondary text-sm">Remove MCP Pro</label>
+
+                </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>
+            @endif
+            @endif
+            @if($patient->mcp && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->mcp->uid)
+            <form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->mcp->uid}}';" method="POST" target="_top" class="d-inline-block">
+              @csrf
+              <input type="hidden" name="proUid" value="{{$patient->mcp->uid}}">
+              <button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user on-hover-opaque"></i></button>
+            </form>
+            @endif
+          </div>
+          <div>
+            <label>CC:</label> {{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-' }}
+            @if($pro->pro_type == 'ADMIN')
+            <div moe class="ml-2 hide-inside-popup">
+              <a start show><i class="fa fa-edit on-hover-opaque text-sm"></i></a>
+              <form url="/api/client/putDefaultNaPro" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <label class="text-secondary text-sm">Care Coordinator</label>
+                  <select provider-search data-pro-uid="{{ @$patient->defaultNaPro->uid }}" name="defaultNaProUid" class="form-control form-control-sm">
+                    <option value=""> --select--</option>
+                    @foreach($pros as $iPro)
+                    <option value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                    @endforeach
+                  </select>
+                </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->pcp)
+            <div moe class="ml-2 hide-inside-popup">
+              <a start show><i class="fa fa-times"></i></a>
+              <form url="/api/client/removeDefaultNaPro" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <label class="text-secondary text-sm">Remove Care Coordinator</label>
+
+                </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>
+            @endif
+            @endif
+            @if($patient->defaultNaPro && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->defaultNaPro->uid)
+            <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 on-hover-opaque"></i></button>
+            </form>
+            @endif
+          </div>
           <div class="">
             <span>Status:</small>
-            <b>{{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}</b>
+            {{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}
 
             @if($pro->pro_type == 'ADMIN')
             <div moe class="ml-2 hide-inside-popup">
@@ -247,13 +354,6 @@ $addressParts .= implode(", ", $addressPart2);
                 </div>
               </form>
             </span>
-            @else
-            <span class="text-dark d-inline-flex align-items-center">
-              <span class="mr-2 text-secondary">
-                <i class="fa fa-check text-sm"></i>
-                <span>MCP Onboarding Visit Completed</span>
-              </span>
-            </span>
             @endif
           </div>
         </div>
@@ -300,61 +400,7 @@ $addressParts .= implode(", ", $addressPart2);
       @include('app.patient.coverage-status')
     </div>
     @endif
-    <div class="bg-light p-2 border">
-      <div>
-        <label>MCP:</label> {{$mcpName}}
-        @if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
-        <div moe class="ml-2 hide-inside-popup">
-          <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
-          <form url="/api/client/putMcp" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-              <label class="text-secondary text-sm">MCP Pro</label>
-              <select name="mcpProUid" provider-search data-pro-uid="{{ @$patient->mcp->uid }}" class="form-control form-control-sm">
-                <option value=""> --select--</option>
-                @foreach($pros as $iPro)
-                <option value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-                @endforeach
-              </select>
-            </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->mcp)
-        <div moe class="ml-2 hide-inside-popup">
-          <a start show><i class="fa fa-times on-hover-opaque"></i></a>
-          <form url="/api/client/removeMcp" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-              <label class="text-secondary text-sm">Remove MCP Pro</label>
-
-            </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>
-        @endif
-        @endif
-        @if($patient->mcp && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->mcp->uid)
-        <form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->mcp->uid}}';" method="POST" target="_top" class="d-inline-block">
-          @csrf
-          <input type="hidden" name="proUid" value="{{$patient->mcp->uid}}">
-          <button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user on-hover-opaque"></i></button>
-        </form>
-        @endif
-      </div>
+    <div class="bg-light p-2 border d-none">
       @if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
       <div>
         <label>Status (mcp):</label>
@@ -394,56 +440,7 @@ $addressParts .= implode(", ", $addressPart2);
         </div>
       </div>
       @endif
-      <div>
-        <label>CC:</label> {{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-' }}
-        @if($pro->pro_type == 'ADMIN')
-        <div moe class="ml-2 hide-inside-popup">
-          <a start show><i class="fa fa-edit on-hover-opaque text-sm"></i></a>
-          <form url="/api/client/putDefaultNaPro" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-              <label class="text-secondary text-sm">Care Coordinator</label>
-              <select provider-search data-pro-uid="{{ @$patient->defaultNaPro->uid }}" name="defaultNaProUid" class="form-control form-control-sm">
-                <option value=""> --select--</option>
-                @foreach($pros as $iPro)
-                <option value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-                @endforeach
-              </select>
-            </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->pcp)
-        <div moe class="ml-2 hide-inside-popup">
-          <a start show><i class="fa fa-times"></i></a>
-          <form url="/api/client/removeDefaultNaPro" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-              <label class="text-secondary text-sm">Remove Care Coordinator</label>
-
-            </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>
-        @endif
-        @endif
-        @if($patient->defaultNaPro && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->defaultNaPro->uid)
-        <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 on-hover-opaque"></i></button>
-        </form>
-        @endif
-      </div>
+      
       @if($patient->defaultNaPro && $patient->defaultNaPro->id === $pro->id || $pro->pro_type == 'ADMIN')
       <div>
         <label>Status (cc):</label>
@@ -593,12 +590,6 @@ $addressParts .= implode(", ", $addressPart2);
             </a>
           </div>
         </li>
-        <li class="mb-1 d-flex align-items-start">
-          <div class="d-inline-flex screen-only">
-            <span class="mr-2"><b>Best Time to Call: </b> <i class="fas fa-clock"></i> {{ $patient->best_time_to_call ?? '-' }}</span>
-            @include('app.patient.partials.update-best-time-to-call')
-          </div>
-        </li>
       </ul>
 
     </div>

resources/views/layouts/patient.blade.php

@@ -255,12 +255,12 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 		@endif
 		<main role="main" class="w-100 {{$trimLayout || $isVisitNote ? 'p-0' : ''}}">
 			@if($pro->is_enrolled_as_mcp && !$patient->mcp)
-			<div class="alert alert-info bg-white mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup m-1">
-				<div class="font-size-16">
+			<div class="d-flex align-items-center alert alert-info bg-white mcp-theme-1 p-3 hide-inside-ticket-popup m-1">
+				<div class="font-size-16 mr-3">
 					<i class="fa fa-exclamation-triangle text-warning-mellow"></i>
 					This patient currently does not have an MCP assigned.
 				</div>
-				<div class="mt-3 d-flex align-items-center">
+				<div class="d-flex align-items-center">
 					<button class="btn btn-info" onclick="$('.in-conv-confirmed').removeClass('d-none').addClass('d-inline-flex')">I am currently seeing or talking to this patient</button>
 					<div class="in-conv-confirmed d-none align-items-center">
 						<i class="fa fa-chevron-right mx-3 text-secondary"></i>
@@ -302,8 +302,9 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 					</div>
 				</div>
 				@if($pro->pro_type === 'ADMIN')
-				<div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue hide-inside-popup">
-					<b class="">Tags ({{count($patient->clientTags)}}):</b>
+				<div class="screen-only card-header py-2 d-flex align-items-start justify-content-between mcp-theme-1 bg-aliceblue hide-inside-popup">
+					<div class="d-flex align-items-center">
+						<b class="">Tags ({{count($patient->clientTags)}}):</b>
 					@foreach($patient->clientTags as $tag)
 					<div class="d-inline-flex align-items-center ml-2 py-1 px-2 rounded bg-aliceblue text-info">
 						<span class="text-sm">{{$tag->tag}}</span>
@@ -334,6 +335,13 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 							</div>
 						</form>
 					</div>
+					</div>
+
+					<div>
+						<span class="mr-2"><b>Best Time to Call:</b> {{ $patient->best_time_to_call ?? '-' }}</span>
+						@include('app.patient.partials.update-best-time-to-call')
+					</div>
+					
 				</div>
 				@endif
 				{{--<div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">