Peter Muturi 3 жил өмнө
parent
commit
21740e4e2d

+ 2 - 2
resources/views/app/mcp/cancelled_appointments_pending_review.blade.php

@@ -4,9 +4,9 @@
     <div class="p-3 mcp-theme-1" id="patients-list">
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-3 py-2 hide-inside-popup">
                 <strong class="mr-4">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-calendar-alt"></i>
                     Cancelled Appointments Pending Review
                 </strong>
             </div>

+ 2 - 4
resources/views/app/mcp/cancelled_bills_pending_review.blade.php

@@ -1,9 +1,9 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0">
+        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-file-invoice-dollar"></i>
                 Cancelled Bills Pending Review
             </strong>
         </div>
@@ -40,5 +40,3 @@
         </div>
     </div>
 </div>
-
-

+ 2 - 5
resources/views/app/mcp/cancelled_supply_orders_pending_review.blade.php

@@ -1,9 +1,9 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0">
+        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-box"></i>
                 Cancelled Supply Orders Pending Review
             </strong>
         </div>
@@ -40,6 +40,3 @@
         </div>
     </div>
 </div>
-
-
-

+ 2 - 5
resources/views/app/mcp/erx_and_orders_pending_signature.blade.php

@@ -1,9 +1,9 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0">
+        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-box"></i>
                 ERx & Orders Pending Signature
             </strong>
         </div>
@@ -71,6 +71,3 @@
         </div>
     </div>
 </div>
-
-
-

+ 20 - 16
resources/views/app/mcp/new_patients_awaiting_visit.blade.php

@@ -1,19 +1,22 @@
+@extends ('layouts/template')
+
+@section('content')
     <div class="p-3 mcp-theme-1">
-        <div class="card">
+        <div class="card border-top-0">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0">
+            <div class="card-header px-3 py-2 border-bottom-0 hide-inside-popup">
                 <strong class="mr-4">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     New Patients Awaiting Visit
                 </strong>
             </div>
 
-            <div class="card-body p-0 border-top-0 pb-0">
+            <div class="card-body p-0 pb-0">
                 <table class="table table-sm table-striped mb-0">
                     <thead>
                     <tr>
-                        <th class="border-bottom-0">Chart #</th>
-                        <th class="border-bottom-0">Name (F.I. LAST)</th>
+                        <th class="border-bottom-0"> #</th>
+                        <th class="border-bottom-0">Name</th>
                         <th class="border-bottom-0">DOB</th>
                         <th class="border-bottom-0">Gender</th>
                         <th class="border-bottom-0">BMI</th>
@@ -23,8 +26,8 @@
                         <th class="border-bottom-0">Status</th>
                         <th class="border-bottom-0">CCM</th>
                         <th class="border-bottom-0">RPM</th>
-                        <th class="border-bottom-0">Last Weight-In</th>
-                        <th class="border-bottom-0">Last BP</th>
+                        <th class="border-bottom-0 d-none">Last Weight-In</th>
+                        <th class="border-bottom-0 d-none">Last BP</th>
                         <th class="border-bottom-0">Assigned On</th>
                     </tr>
                     </thead>
@@ -42,30 +45,30 @@
                             <td class="border-bottom-0">{{$row->usual_bmi}}</td>
                             <td class="border-bottom-0">
                                 <?php $coverageStatus = $row->getPrimaryCoverageStatus(); ?>
+                                <div class="text-nowrap">
                                 @if($coverageStatus === 'YES')
-                                    <div class="text-nowrap">Covered <i class="fa fa-check-circle text-success"></i>
-                                    </div>
+                                     <i class="fa fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="Covered"></i>
                                 @elseif($coverageStatus === 'NO')
-                                    <div class="text-nowrap">Not Covered <i class="fa fa-times text-danger"></i></div>
+                                    <i class="fa fa-times text-danger" data-toggle="tooltip" data-placement="bottom" title="Not Covered"></i>
                                 @else
-                                    <div class="text-nowrap">Unknown <i
-                                                class="fa fa-exclamation-triangle text-warning-mellow"></i></div>
+                                    <i class="fa fa-exclamation-triangle text-warning-mellow" data-toggle="tooltip" data-placement="bottom" title="Unknown"></i>
                                 @endif
                                 <?php $coverage = $row->getPrimaryCoverage(); ?>
                                 @if($coverage)
-                                    {{$coverage->toString()}}
+                                    {{ucwords(strtolower($coverage->toString()))}}
                                 @endif
+                              </div>
                             </td>
                             <td class="border-bottom-0">{{$row->lastMcpAppointment() ? $row->lastMcpAppointment()->start_date : '-'}}</td>
                             <td class="border-bottom-0">{{$row->nextMcpAppointment() ? $row->nextMcpAppointment()->start_date : '-'}}</td>
                             <td class="border-bottom-0">{{$row->nextMcpAppointment() ? $row->nextMcpAppointment()->status : '-'}}</td>
                             <td class="border-bottom-0">{{$row->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>
                             <td class="border-bottom-0">{{$row->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>
-                            <td class="border-bottom-0">
+                            <td class="border-bottom-0 d-none">
                                 <?php $m = $row->lastMeasurementOfType('Wt. (lbs.)'); ?>
                                 {{$m && $m->value ? round($m->value, 2) : '-'}}
                             </td>
-                            <td class="border-bottom-0">
+                            <td class="border-bottom-0 d-none">
                                 <?php $m = $row->lastMeasurementOfType('BP'); ?>
                                 {{$m && $m->value ? $m->value : '-'}}
                             </td>
@@ -77,3 +80,4 @@
             </div>
         </div>
     </div>
+@endsection

+ 2 - 3
resources/views/app/mcp/notes_pending_billing.blade.php

@@ -3,12 +3,12 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-sticky-note"></i>
                 Notes Pending Billing
             </strong>
         </div>
 
-        <div class="card-body p-0 border-top-0 pb-0">
+        <div class="card-body border-top-0 p-0 pb-0">
             <table class="table table-sm table-striped mb-0">
                 <thead>
                 <tr>
@@ -45,4 +45,3 @@
         </div>
     </div>
 </div>
-

+ 3 - 4
resources/views/app/mcp/notes_pending_signature.blade.php

@@ -1,9 +1,9 @@
 <div class="p-3 mcp-theme-1">
-    <div class="card">
+    <div class="card border-top-0">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0">
+        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-sticky-note"></i>
                 Notes Pending Signature
             </strong>
         </div>
@@ -45,4 +45,3 @@
         </div>
     </div>
 </div>
-

+ 23 - 20
resources/views/app/mcp/patients-table.blade.php

@@ -1,10 +1,11 @@
 <table class="table table-condensed p-0 m-0">
 	<thead class="bg-light">
 		<tr>
-			<th class="px-3 border-0">Chart #</th>
-			<th class="px-3 border-0">Name (F.I. LAST)</th>
+			<th class="px-3 border-0">#</th>
+			<th class="px-3 border-0">Name</th>
 			<th class="px-3 border-0">DOB</th>
-			<th class="px-3 border-0">Gender</th>
+			<th class="px-3 border-0">Age</th>
+			<th class="px-3 border-0">Sex</th>
 			<th class="px-3 border-0">BMI</th>
 			<th class="px-3 border-0">Insurance</th>
 			<th class="px-3 border-0">Last Visit</th>
@@ -12,8 +13,8 @@
 			<th class="px-3 border-0">Status</th>
 			<th class="px-3 border-0">CCM</th>
 			<th class="px-3 border-0">RPM</th>
-			<th class="px-3 border-0">Last Weight-In</th>
-			<th class="px-3 border-0">Last BP</th>
+			<th class="px-3 border-0 d-none">Last Weight-In</th>
+			<th class="px-3 border-0 d-none">Last BP</th>
 			<th class="px-3 border-0">Assigned On</th>
 		</tr>
 	</thead>
@@ -26,34 +27,36 @@
 				</a>
 			</td>
 			<td>{{$patient->displayName()}}</td>
-			<td class="text-nowrap">{{ friendly_date_time($patient->dob, false) }} {{ $patient->age_in_years ? '(' . $patient->age_in_years . ' y.o)' : '(-)' }}</td>
+			<td class="text-nowrap">{{ friendly_date_time($patient->dob, false) }}</td>
+			<td>{{ $patient->age_in_years ?  $patient->age_in_years . ' y.o' : '-' }}</td>
 			<td>{{ $patient->sex }}</td>
 			<td>{{ $patient->usual_bmi }}</td>
 			<td>
 				<?php $coverageStatus = $patient->getPrimaryCoverageStatus(); ?>
-				@if($coverageStatus === 'YES')
-				<div class="text-nowrap">Covered <i class="fa fa-check-circle text-success"></i>
+				<div class="text-nowrap">
+					@if($coverageStatus === 'YES')
+							 <i class="fa fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="Covered"></i>
+					@elseif($coverageStatus === 'NO')
+							<i class="fa fa-times text-danger" data-toggle="tooltip" data-placement="bottom" title="Not Covered"></i>
+					@else
+							<i class="fa fa-exclamation-triangle text-warning-mellow" data-toggle="tooltip" data-placement="bottom" title="Unknown"></i>
+					@endif
+					<?php $coverage = $patient->getPrimaryCoverage(); ?>
+					@if($coverage)
+					{{ucwords(strtolower($coverage->toString()))}}
+					@endif
 				</div>
-				@elseif($coverageStatus === 'NO')
-				<div class="text-nowrap">Not Covered <i class="fa fa-times text-danger"></i></div>
-				@else
-				<div class="text-nowrap">Unknown <i class="fa fa-exclamation-triangle text-warning-mellow"></i></div>
-				@endif
-				<?php $coverage = $patient->getPrimaryCoverage(); ?>
-				@if($coverage)
-				{{$coverage->toString()}}
-				@endif
 			</td>
 			<td>{{$patient->lastMcpAppointment() ? $patient->lastMcpAppointment()->start_date : '-'}}</td>
 			<td>{{$patient->nextMcpAppointment() ? $patient->nextMcpAppointment()->start_date : '-'}}</td>
 			<td>{{$patient->nextMcpAppointment() ? $patient->nextMcpAppointment()->status : '-'}}</td>
 			<td>{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>
 			<td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>
-			<td>
+			<td class="d-none">
 				<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>
 				{{$m && $m->value ? round($m->value, 2) : '-'}}
 			</td>
-			<td>
+			<td class="d-none">
 				<?php $m = $patient->lastMeasurementOfType('BP'); ?>
 				{{$m && $m->value ? $m->value : '-'}}
 			</td>
@@ -71,4 +74,4 @@
 </table>
 <div class="p-3">
 	{{$patients->withQueryString()->links()}}
-</div>
+</div>

+ 2 - 2
resources/views/app/mcp/patients_overdue_for_visit.blade.php

@@ -4,9 +4,9 @@
     <div class="p-3 mcp-theme-1" id="patients-list">
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-3 py-2 hide-inside-popup">
                 <strong class="mr-4">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Patients Overdue for Visit
                 </strong>
             </div>

+ 2 - 2
resources/views/app/mcp/patients_without_appointments.blade.php

@@ -4,9 +4,9 @@
     <div class="p-3 mcp-theme-1" id="patients-list">
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-3 py-2 hide-inside-popup">
                 <strong class="mr-4">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Patients w/o Appointments
                 </strong>
             </div>

+ 2 - 4
resources/views/app/mcp/reports_pending_signature.blade.php

@@ -1,9 +1,9 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0">
+        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-file-signature"></i>
                 Reports Pending Signature
             </strong>
         </div>
@@ -56,5 +56,3 @@
         </div>
     </div>
 </div>
-
-

+ 2 - 5
resources/views/app/mcp/supply_orders_pending_signature.blade.php

@@ -1,9 +1,9 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0">
+        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-box"></i>
                 Supply Orders Pending Signature
             </strong>
         </div>
@@ -40,6 +40,3 @@
         </div>
     </div>
 </div>
-
-
-

+ 2 - 0
resources/views/layouts/patient.blade.php

@@ -883,6 +883,8 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 					}
 				});
 
+				$('[data-toggle="tooltip"]').tooltip('hover');
+
 				$('.note-method-select').each(function() {
 					let form = $(this).closest('form');
 					if(this.value === 'IN_CLINIC') {

+ 4 - 3
resources/views/layouts/template.blade.php

@@ -50,6 +50,7 @@
     <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>
 
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
     {{-- med ac --}}
     <link href='/css/autocomplete-lhc.min.css' rel="stylesheet">
     <script src='/js/autocomplete-lhc.js'></script>
@@ -102,11 +103,11 @@
 
                 @if($pro)
                     @if($pro->is_enrolled_as_mcp)
-                    <li class="nav-item"><a class="nav-link" href="{{ route('mcp.patients') }}"><i class="mr-1 fas fa-user-injured"></i> Patients</a> </li>
+                    <li class="nav-item"><a class="nav-link" href="{{ route('mcp.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
                     @elseif($pro->pro_type == 'ADMIN')
-                    <li class="nav-item"><a class="nav-link" href="{{ route('admin.patients') }}"><i class="mr-1 fas fa-user-injured"></i> Patients</a> </li>
+                    <li class="nav-item"><a class="nav-link" href="{{ route('admin.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
                     @else
-                    <li class="nav-item"><a class="nav-link" href="{{ route('dna.patients') }}"><i class="mr-1 fas fa-user-injured"></i> Patients</a> </li>
+                    <li class="nav-item"><a class="nav-link" href="{{ route('dna.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
                     @endif
                 @endif