Merge branch 'dev' into dev-vj

public/css/style.css

@@ -2363,4 +2363,12 @@ table .stag-filter-highlight {
 
 .event-bg-gray {
     background-color: #ececec;
+}
+.popover-header {
+    padding: 3px 10px;
+    font-size: 13px;
+    font-weight: bold;
+}
+.popover-body {
+    font-size: 13px;
 }

resources/views/app/dna/appointments.blade.php

@@ -24,7 +24,7 @@
                         <th class="border-0">Age</th>
                         <th class="border-0">Sex</th>
                         <th class="border-0">Insurance</th>
-                        <th class="border-0">MCP</th>
+                        <th class="border-0">HCP</th>
                         <th class="border-0">Time</th>
                         <th class="border-0">Status</th>
                     </tr>
@@ -32,7 +32,6 @@
                 <tbody>
                     @foreach($appointments as $appointment)
                     <tr>
-
                         <td class="text-nowrap">
                             <a native target="_blank" href="{{route('patients.view.dashboard', $appointment->client)}}">
                                 {{$appointment->client->chart_number}}
@@ -62,7 +61,7 @@
                                 @endif
                             </div>
                         </td>
-                        <td>{{ $appointment->client->mcp->displayName() }}</td>
+                        <td>{{ $appointment->pro->displayName() }}</td>
                         <td>
                             <a href="/patients/view/{{$appointment->client->uid}}/calendar/{{$appointment->uid}}" class="text-nowrap">
                                 {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}}

resources/views/app/dna/dashboard/patients_without_appointment.blade.php

@@ -9,10 +9,12 @@
                 <table class="table table-sm table-striped mb-0">
                     <thead class="bg-light">
                         <tr>
+                            <th class="border-0">Chart #</th>
                             <th class="border-0">Patient</th>
-                            <th class="border-0">Type</th>
-                            <th class="border-0">Value</th>
-                            <th class="border-0" colspan="4">Timestamp</th>
+                            <th class="border-0">DOB</th>
+                            <th class="border-0">Gender</th>
+                            <th class="border-0">Insurance</th>
+                            <th class="border-0">MCP</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -38,9 +40,6 @@
                             <td class="text-nowrap">
                                 {{$row->mcp->name_display ?? '' }}
                             </td>
-                            <td class="text-nowrap">
-                                {{friendly_date($row->most_recent_completed_mcp_note_date)}}
-                            </td>
                         </tr>
                         @endforeach
                     </tbody>

resources/views/app/dna/encounters.blade.php

@@ -24,7 +24,7 @@
                         <th class="border-0">Age</th>
                         <th class="border-0">Sex</th>
                         <th class="border-0">Insurance</th>
-                        <th class="border-0">MCP</th>
+                        <th class="border-0">HCP</th>
                         <th class="border-0">Visit Date</th>
                     </tr>
                 </thead>
@@ -60,7 +60,7 @@
                                 @endif
                             </div>
                         </td>
-                        <td>{{ $note->client->mcp->displayName() }}</td>
+                        <td>{{ $note->hcpPro ? $note->hcpPro->displayName() : '' }}</td>
                         <td class="px-2">
                             <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">
                                 {{ friendly_date_time($note->effective_dateest, false) }}

resources/views/app/dna/patients-table.blade.php

@@ -55,7 +55,16 @@
 			</td>
 			<td>
 				<div class="d-flex flex-column">
-					<span>{{ $patient->mcp ? $patient->mcp->displayName() :'' }}</span>					
+					<span>{{ $patient->mcp ? $patient->mcp->displayName() :'' }}</span>	
+					<span>Status: 
+						@if($patient->has_mcp_done_onboarding_visit === 'YES')
+						<i class="fas fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="YES"></i>
+						@elseif($patient->has_mcp_done_onboarding_visit === 'NO')
+						<i class="fas fa-times-circle text-danger" data-toggle="tooltip" data-placement="bottom" title="NO"></i>
+						@elseif($patient->has_mcp_done_onboarding_visit === 'UNKNOWN')
+							<i class="fas fa-question-circle text-secondary" data-toggle="tooltip" data-placement="bottom" title="UNKNOWN"></i>
+						@endif
+					</span>				
 					@if($patient->mostRecentCompletedMcpNote)
 						<span>Last Encounter:  
 						<a href="/patients/view/{{ $patient->mostRecentCompletedMcpNote->client->uid }}/notes/view/{{ $patient->mostRecentCompletedMcpNote->uid }}" class="font-weight-bold">
@@ -78,7 +87,33 @@
 			</td>
 			<td>
 			   <div class="d-flex flex-column">
-			   		<span>Enrolled: {{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</span>
+			   		<span>Enrolled:
+					   @if($patient->is_enrolled_in_rm === 'YES')
+						<i class="fas fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="YES"></i>
+						@elseif($patient->is_enrolled_in_rm === 'NO')
+						<i 
+						class="fas fa-times-circle text-danger" 
+						tabindex="0"
+						data-toggle="popover"
+						title="No" 
+						data-target="#enrollment-{{ $patient->uid }}"
+						></i>
+						@elseif($patient->is_enrolled_in_rm === 'UNKNOWN')
+							<i 
+							tabindex="0"
+							data-toggle="popover"
+							title="Uknown" 
+   							data-target="#enrollment-{{ $patient->uid }}"
+							class="fas fa-question-circle text-secondary" 
+							popover
+							></i>
+						@endif   
+					</span>
+					<div id="enrollment-{{ $patient->uid }}" class="d-none">
+						<span>Is Eligible for RM: {{ $patient->is_eligible_for_rm }}</span><br>
+						<span>Why not eligible: {{ $patient->why_not_eligible_for_rm_category ?? '---' }}</span><br>
+						<span>{{ $patient->why_not_eligible_for_rm_memo }}</span>
+					</div>
 				<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)');?>
 				@if($m)
 				<span>Wt. (lbs.) {{$m && $m->value ? round($m->value, 2) : '-'}}</span>

resources/views/app/dna/patients.blade.php

@@ -19,5 +19,44 @@
         </div>
     </div>
 </div>
+
+<script>
+	(function() {
+		function init() {
+			var patientsComponent = {
+                initTooltip: function(){
+                    $('[data-toggle="tooltip"]').tooltip({html:true});
+                },
+                initPopover: function () {
+                        var self = this;
+                        var popovers = $('[popover]');
+                        popovers.each(function () {
+                            var element = $(this);
+                            console.log({element});
+                            var target = element.data('target');
+                            $(this).blur();
+                            $(this).popover({
+                                html: true,
+                                trigger: 'focus',
+                                placement: 'top',
+                                sanitize: false,
+                                content: function () {
+                                    var content = $(target).html();
+                                    console.log({content, target});
+                                    return content;
+                                }
+                            });
+                        });
+                    },
+                init: function(){
+                    this.initTooltip();
+                    this.initPopover();
+                }
+            };
+            patientsComponent.init();
+		}
+		addMCInitializer('patients-list', init, '#patients-list');
+	})();
+</script>
 @endsection
 

resources/views/app/new-patient.blade.php

@@ -23,7 +23,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 					<div class="alert alert-danger">{{ session('message') }}</div>
 					@endif
 					<div class="row">
-						<div class="col-md-5">
+						<div class="border-lighter col-md-5">
 							<div class="row">
 								<div class="col-md-12 bg-light p-3 mb-2">
 									<h5 class="m-0 font-weight-bold">Patient Name / Demographics:</h5>
@@ -258,11 +258,11 @@ $medicaidStates = Config::get('constants.medicaid_states');
 										</div>
 										<div class="row" v-if="planType == 'MEDICAID' || planType == 'COMMERCIAL'" :class="planType == 'COMMERCIAL' ? 'mx-0' : ''">
 											<div class="col-md-12">
-												<div class="bg-light p-1 mb-2">
+												<div class="bg-light p-2 mb-2">
 													<h5 class="m-0 font-weight-bold">Medicaid Information:</h5>
 												</div>
 											</div>
-											<div class="col-12">
+											<div class="col-12 px-0">
 												<div class="px-2">
 													<div class="form-group col-md-6">
 														<label for="" class="control-label">Medicaid State</label>
@@ -285,11 +285,11 @@ $medicaidStates = Config::get('constants.medicaid_states');
 
 										<div class="row" v-if="planType == 'MEDICARE' || planType == 'COMMERCIAL'" :class="planType == 'COMMERCIAL' ? 'mx-0' : ''">
 											<div class="col-md-12">
-												<div class="bg-light p-1 mb-2">
+												<div class="bg-light p-2 mb-2">
 													<h5 class="m-0 font-weight-bold">Medicare Information:</h5>
 												</div>
 											</div>
-											<div class="col-12">
+											<div class="col-12 px-0">
 												<div class="px-2">
 													<div class="form-group col-md-6">
 														<label class="control-label">Medicare Number</label>

resources/views/layouts/template.blade.php

@@ -44,9 +44,10 @@
     <link href="{{asset('/css/z.css')}}?v={{config('app.asset_version')}}" rel=stylesheet>
     <!-- Styles -->
 
-    <script src="{{ asset('js/app.js') }}?v={{config('app.asset_version')}}" type="application/javascript"></script>
+    
     <script src="/js/jquery-3.5.1.min.js"></script>
     <script src="/js/jquery.form.min.js"></script>
+    <script src="{{ asset('js/app.js') }}?v={{config('app.asset_version')}}" type="application/javascript"></script>
     <script src="{{ asset('js/toastr.min.js') }}" type="application/javascript"></script>
     <script src="/js/yemi.js?v={{config('app.asset_version')}}" type="application/javascript"></script>