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

resources/views/app/mcp/appointments_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" value="{{ $date_value_1 ?? '' }}" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" value="{{ $date_value_2 ?? '' }}" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -48,7 +44,7 @@
 			</select>
 		</div>
 	</div>
-	
+
 	<!-- NEW/FU -->
 	<div class="col-md-2">
 		<div class="form-group">
@@ -85,7 +81,7 @@
 				},
 				methods: {
 					init: function() {
-						
+
 					}
 				},
 				mounted: function() {
@@ -97,4 +93,4 @@
 		}
 		addMCInitializer('mcp-appointments-filters', init, '#mcp-appointments-filters');
 	})();
-</script>
+</script>

resources/views/app/mcp/bills_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" value="{{ $date_value_1 ?? '' }}" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" value="{{ $date_value_2 ?? '' }}" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -84,4 +80,4 @@
 		}
 		addMCInitializer('mcp-bills-filters', init, '#mcp-bills-filters');
 	})();
-</script>
+</script>

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>

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>
-
-

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>
-
-
-

resources/views/app/mcp/client_messages_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- TO OR FROM ME -->
@@ -107,4 +103,4 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 		}
 		addMCInitializer('mcp-client-messages-filters', init, '#mcp-client-messages-filters');
 	})();
-</script>
+</script>

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>
-
-
-

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

resources/views/app/mcp/notes_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" value="{{ $date_value_1 ?? '' }}" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" value="{{ $date_value_2 ?? '' }}" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -47,7 +43,7 @@
 				<option value="CANCELLED">Cancelled</option>
 			</select>
 		</div>
-	</div>	
+	</div>
 
 	<div class="col-md-2">
 		<div class="form-group d-flex">
@@ -66,13 +62,13 @@
 				delimiters: ['@{{', '}}'],
 				data: {
 					filters: {
-						date_category: "<?= $date_category ?? '' ?>",						
+						date_category: "<?= $date_category ?? '' ?>",
 						status: "<?= $status ?? '' ?>"
 					}
 				},
 				methods: {
 					init: function() {
-						
+
 					}
 				},
 				mounted: function() {
@@ -84,4 +80,4 @@
 		}
 		addMCInitializer('mcp-notes-filters', init, '#mcp-notes-filters');
 	})();
-</script>
+</script>

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>
-

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>
-

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>

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

@@ -6,7 +6,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Patients
             </strong>
         </div>
@@ -19,4 +19,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection

resources/views/app/mcp/patients_filters.blade.php

@@ -7,7 +7,7 @@
 		min-width: 100px;
 	}
 </style>
-<form id="mcp-patients-filters" method="GET" action="{{ route('mcp.patients') }}" class="row align-items-end" v-cloak>
+<form id="mcp-patients-filters" method="GET" action="{{ route('mcp.patients') }}" class="row align-items-start" v-cloak>
 	<div class="col-md-2">
 		<div class="form-group">
 			<label>Name:</label>
@@ -26,18 +26,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-show="filters.age_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="age_value_1" v-model="filters.age_value_1" type="number" class="form-control input-sm" :placeholder="(filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
-		</div>
-	</div>
-	<div v-show="filters.age_category && (filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="age_value_2" v-model="filters.age_value_2" type="number" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.age_category" class="row mt-2">
+				<div :class="filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="age_value_1" v-model="filters.age_value_1" type="number" class="form-control input-sm" :placeholder="(filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="age_value_2" v-model="filters.age_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- SEX -->
@@ -63,18 +59,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-show="filters.bmi_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="bmi_value_1" v-model="filters.bmi_value_1" type="number" class="form-control input-sm" :placeholder="(filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
-		</div>
-	</div>
-	<div v-show="filters.bmi_category && (filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="bmi_value_2" v-model="filters.bmi_value_2" type="number" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.bmi_category" class="row mt-2">
+				<div :class="filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="bmi_value_1" v-model="filters.bmi_value_1" type="number" class="form-control input-sm" :placeholder="(filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+				</div>
+				<div v-show="filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="bmi_value_2" v-model="filters.bmi_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
@@ -90,18 +82,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-show="filters.last_visit_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_visit_value_1" v-model="filters.last_visit_value_1" type="date" class="form-control input-sm" :placeholder="(filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN') ? 'From' : 'Last Visit'" />
-		</div>
-	</div>
-	<div v-show="filters.last_visit_category && (filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_visit_value_2" v-model="filters.last_visit_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.last_visit_category" class="row mt-2">
+				<div :class="filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="last_visit_value_1" v-model="filters.last_visit_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+				</div>
+				<div v-show="filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="last_visit_value_2" v-model="filters.last_visit_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
@@ -117,18 +105,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.next_appointment_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="next_appointment_value_1" v-model="filters.next_appointment_value_1" type="date" class="form-control input-sm" :placeholder="(filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN') ? 'From' : 'Next Appointment'" />
-		</div>
-	</div>
-	<div v-if="filters.next_appointment_category && (filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="next_appointment_value_2" v-model="filters.next_appointment_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.next_appointment_category" class="row mt-2">
+				<div :class="filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="next_appointment_value_1" v-model="filters.next_appointment_value_1" type="number" class="form-control input-sm" :placeholder="(filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+				</div>
+				<div v-show="filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="next_appointment_value_2" v-model="filters.next_appointment_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
@@ -146,7 +130,7 @@
 	</div>
 
 	<!-- LAST WEIGHED-IN -->
-	<div class="col-md-2">
+	<div class="col-md-2 d-none">
 		<div class="form-group">
 			<label>Last Weighed-In:</label>
 			<select name="last_weighed_in_category" class="form-control input-sm" v-model="filters.last_weighed_in_category">
@@ -157,23 +141,19 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.last_weighed_in_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_weighed_in_value_1" v-model="filters.last_weighed_in_value_1" type="date" class="form-control input-sm" :placeholder="(filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN') ? 'From' : 'Enter Date'" />
-		</div>
-	</div>
-	<div v-if="filters.last_weighed_in_category && (filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_weighed_in_value_2" v-model="filters.last_weighed_in_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.last_weighed_in_category" class="row mt-2">
+				<div :class="filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="last_weighed_in_value_1" v-model="filters.last_weighed_in_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+				</div>
+				<div v-show="filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="last_weighed_in_value_2" v-model="filters.last_weighed_in_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
 	<!-- LAST BP -->
-	<div class="col-md-2">
+	<div class="col-md-2 d-none">
 		<div class="form-group">
 			<label>Last BP:</label>
 			<select name="last_bp_category" class="form-control input-sm" v-model="filters.last_bp_category">
@@ -184,26 +164,24 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.last_bp_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_bp_value_1" v-model="filters.last_bp_value_1" type="date" class="form-control input-sm" :placeholder="(filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN') ? 'From' : 'Enter Date'" />
-		</div>
-	</div>
-	<div v-if="filters.last_bp_category && (filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_bp_value_2" v-model="filters.last_bp_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.last_bp_category" class="row mt-2">
+				<div :class="filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="last_bp_value_1" v-model="filters.last_bp_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+				</div>
+				<div v-show="filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="last_bp_value_2" v-model="filters.last_bp_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
 	<div class="col-md-2">
-		<div class="form-group d-flex">
+		<div class="form-group">
 			<label>&nbsp;</label>
-			<button type="button" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
-			<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			<div class=" d-flex">
+				<button type="button" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="w-50 btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			</div>
 		</div>
 	</div>
 </form>
@@ -248,7 +226,7 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 				},
 				methods: {
 					init: function() {
-						
+
 					},
 					doSubmit: function() {
 						fastLoad('{{ route('mcp.patients') }}?' + $('#mcp-patients-filters').serialize());
@@ -265,4 +243,4 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 		}
 		addMCInitializer('mcp-patients-filters', init, '#mcp-patients-filters');
 	})();
-</script>
+</script>

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>

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>

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>
-
-

resources/views/app/mcp/supply_orders_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" value="{{ $date_value_1 ?? '' }}" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" value="{{ $date_value_2 ?? '' }}" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -108,4 +104,4 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 		}
 		addMCInitializer('mcp-supply-orders-filters', init, '#mcp-supply-orders-filters');
 	})();
-</script>
+</script>

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>
-
-
-

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

@@ -32,6 +32,9 @@
                 <th class="px-2 text-secondary w-25">To</th>
                 <th class="px-2 text-secondary w-50">Content</th>
                 <th></th>
+                @if($performer->pro->pro_type == 'ADMIN')
+                    <th></th>
+                @endif
             </tr>
             </thead>
             <tbody>
@@ -42,27 +45,49 @@
                     <td class="px-2">{{ $sms->from_number }}</td>
                     <td class="px-2">{{ $sms->to_number }}</td>
                     <td class="px-2">{{ $sms->body }}</td>
-
-                    <td>
+                    <td class="px-2">
                         @if($sms->is_reply_needed)
-                        <div moe relative>
-                            <a start show class="">clear</a>
-                            <form url="/api/clientSms/updateIsReplyNeeded" class="mcp-theme-1" right>
-                                <input type="hidden" name="uid" value="{{ $sms->uid }}">
-                                <input type="hidden" name="isReplyNeeded" value="NO">
-                                <div class="mb-2">
-                                    <label for="" class="text-sm text-secondary mb-1">Are you sure?</label>
+                            <div moe relative>
+                                <a start show class="">clear</a>
+                                <form url="/api/clientSms/updateIsReplyNeeded" class="mcp-theme-1" right>
+                                    <input type="hidden" name="uid" value="{{ $sms->uid }}">
+                                    <input type="hidden" name="isReplyNeeded" value="NO">
+                                    <div class="mb-2">
+                                        <label for="" class="text-sm text-secondary mb-1">Are you sure?</label>
 
-                                </div>
+                                    </div>
 
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
                         @endif
                     </td>
+                    @if($performer->pro->pro_type == 'ADMIN')
+                        <td>
+                            <div moe relative>
+                                <a start show class="">Update Is Reply Needed</a>
+                                <form url="/api/clientSms/updateIsReplyNeeded" class="mcp-theme-1" right>
+                                    <input type="hidden" name="uid" value="{{ $sms->uid }}">
+                                    <div class="mb-2">
+                                        <label for="" class="text-sm text-secondary mb-1">Is reply needed?</label>
+                                        <select class="form-control form-control-sm" name="isReplyNeeded" value="{{$patient->cell_number}}">
+                                            <option value="UNKNOWN">--</option>
+                                            <option value="YES">Yes</option>
+                                            <option value="NO">No</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        </td>
+                    @endif
                 </tr>
             @endforeach
             </tbody>

resources/views/app/patients.blade.php

@@ -28,7 +28,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Patients
             </strong>
             <div class="ml-auto d-flex align-items-center search-form">

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') {

resources/views/layouts/template.blade.php

@@ -102,11 +102,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