Merge branch 'dev' into dev-vj

app/Http/Controllers/McpController.php

@@ -139,47 +139,104 @@ class McpController extends Controller
 
     public function notes(Request $request)
     {
-        $notes = Note::paginate(5);
-
-        // SELECT * FROM note WHERE client_id IN (SELECT id FROM client WHERE mcp_pro_id = :me.id);
+        $filters = $request->all();
+        $notes = Note::query();
+        $notes = $notes->where('hcp_pro_id', $this->performer->pro->id);
+        $this->filterMultiQuery($request, $notes, 'effective_time', 'date_category', 'date_value_1', 'date_value_2');
+        $this->filterSimpleQuery($request, $notes, 'new_or_fu_or_na', 'new_or_fu_or_na');   
+        $notes = $notes->orderBy('created_at', 'DESC')->paginate(20);
+        
 
-        return view('app.mcp.notes', compact('notes'));
+        return view('app.mcp.notes', compact('notes','filters'));
     }
 
     public function appointments(Request $request)
     {
-        $appointments = Appointment::paginate(5);
-        return view('app.mcp.appointments', compact('appointments'));
+        $filters = $request->all();
+        $appointments = Appointment::where('pro_id', $this->performer->pro->id);
+        $this->filterMultiQuery($request, $appointments, 'raw_date', 'date_category', 'date_value_1', 'date_value_2');
+        $this->filterSimpleQuery($request, $appointments, 'status', 'status');
+        $appointments = $appointments->orderBy('end_time', 'DESC')->paginate(20);
+        return view('app.mcp.appointments', compact('appointments', 'filters'));
     }
 
     public function bills(Request $request)
     {
-        $bills = Bill::paginate(5);
-        return view('app.mcp.bills', compact('bills'));
+        $filters = $request->all();
+        $bills = Bill::where('hcp_pro_id', $this->performer->pro->id);
+        $this->filterMultiQuery($request, $bills, 'created_at', 'date_category', 'date_value_1', 'date_value_2');
+        $status = $request->get('status');
+        if($status){
+            if($status == 'CANCELLED') $bills = $bills->where('is_cancelled', true);
+            if($status == 'NOT_CANCELLED') $bills = $bills->where('is_cancelled', false);
+        }
+        $bills = $bills->orderBy('created_at', 'DESC')->paginate(20);
+        return view('app.mcp.bills', compact('bills', 'filters'));
     }
 
     public function erx_and_orders(Request $request)
     {
-        $erxAndOrders = Erx::paginate(5);
-        return view('app.mcp.erx_and_orders', compact('erxAndOrders'));
+        $filters = $request->all();
+        $erxAndOrders = Erx::query();
+        $erxAndOrders = $erxAndOrders->where('hcp_pro_id', $this->performer->pro->id);
+        $this->filterMultiQuery($request, $erxAndOrders, 'created_at', 'date_category', 'date_value_1', 'date_value_2');
+        $this->filterSimpleQuery($request, $erxAndOrders, 'pro_declared_status', 'status');
+
+        $erxAndOrders = $erxAndOrders->orderBy('created_at', 'DESC')->paginate(20);
+        return view('app.mcp.erx_and_orders', compact('erxAndOrders', 'filters'));
     }
 
     public function reports(Request $request)
     {
-        $data = [];
-        return view('app.mcp.reports', $data);
+        $filters = $request->all();
+        $reports = IncomingReport::where('hcp_pro_id', $this->performer->pro->id);
+        $this->filterMultiQuery($request, $reports, 'report_date', 'date_category', 'date_value_1', 'date_value_2');
+        $status = $request->get('status');
+        if($status){
+            if($status == 'SIGNED') $reports = $reports->where('has_hcp_pro_signed', true);
+            if($status == 'NOT_SIGNED') $reports = $reports->where('has_hcp_pro_signed', false);
+        }
+
+        $reports = $reports->orderBy('created_at', 'DESC')->paginate(20);
+        return view('app.mcp.reports', compact('reports', 'filters'));
     }
 
     public function supply_orders(Request $request)
     {
-        $supplyOrders = SupplyOrder::paginate(5);
-        return view('app.mcp.supply_orders', compact('supplyOrders'));
+        $filters = $request->all();
+        $supplyOrders = SupplyOrder::select('supply_order.*')->where('supply_order.signed_by_pro_id', $this->performer->pro->id);
+        $this->filterMultiQuery($request, $supplyOrders, 'created_at', 'date_category', 'date_value_1', 'date_value_2');
+        $status = $request->get('status');        
+        if($status){
+            if($status == 'CLEARED_FOR_SHIPMENT'){
+                $supplyOrders = $supplyOrders->where('is_cleared_for_shipment', true);
+            }elseif($status == 'NOT_CLEARED_FOR_SHIPMENT'){
+                $supplyOrders = $supplyOrders->where('is_cleared_for_shipment', false);
+            }elseif($status == 'CANCELLED'){
+                $supplyOrders = $supplyOrders->where('is_cancelled', true);
+            }else{
+             $supplyOrders = $supplyOrders->join('shipment', 'shipment.id', '=', 'supply_order.shipment_id')->where('shipment.status', $status);   
+            }
+            
+        }
+        $supplyOrders = $supplyOrders->orderBy('created_at', 'DESC')->paginate(20);
+        return view('app.mcp.supply_orders', compact('supplyOrders', 'filters'));
     }
 
     public function client_messages(Request $request)
-    {
-        $clientMessages = ClientSMS::paginate(5);
-        return view('app.mcp.client_messages', compact('clientMessages'));
+    {      
+        $filters = $request->all();
+
+        $clientMessages = ClientSMS::select('client_sms.*')
+        ->join('client', 'client.id', '=', 'client_sms.client_id')
+        ->where('client.mcp_pro_id', $this->performer->pro->id);
+
+        $this->filterMultiQuery($request, $clientMessages, 'client_sms.created_at', 'date_category', 'date_value_1', 'date_value_2');
+        $this->filterSimpleQuery($request, $clientMessages, 'sms_status', 'sms_status');
+
+        $clientMessages = $clientMessages->orderBy('client_sms.created_at', 'DESC');
+        $clientMessages = $clientMessages->paginate(20);
+        return view('app.mcp.client_messages', compact('clientMessages', 'filters'));
     }
 
     public function new_patients_awaiting_visit(Request $request){

resources/views/app/dna/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>

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

@@ -7,7 +7,7 @@
 		min-width: 100px;
 	}
 </style>
-<form id="dna-patients-filters" method="GET" action="{{ route('dna.patients') }}" class="row align-items-end" v-cloak>
+<form id="dna-patients-filters" method="GET" action="{{ route('dna.patients') }}" class="row align-items-start" v-cloak>
 	<!-- AGE	 -->
 	<div class="col-md-2">
 		<div class="form-group">

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

@@ -18,23 +18,36 @@
             <table class="table table-condensed p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
-                        <th class="px-3 border-0">HCP</th>
+                        <th class="px-3 border-0">Date & Time</th>
                         <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">New or FU?</th>
+                        <th class="px-3 border-0">Title</th>
+                        <th class="px-3 border-0">Description</th>
                         <th class="px-3 border-0">Status</th>
-                        <th class="px-3 border-0">Note</th>
+                        <th class="px-3 border-0">Confirmation</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($appointments as $appointment)
                     <tr>
-                        <td>{{-- date --}} -</td>
-                        <td>{{-- hcp --}} -</td>
-                        <td>{{-- patient --}} - </td>
-                        <td>{{-- New or FU? --}} - </td>  
-                        <td>{{-- Status --}} - </td>  
-                        <td>{{-- Note --}} - </td>
+                        <td class="px-2">
+                            <a href="/patients/view/{{$appointment->client->uid}}/calendar/{{$appointment->uid}}" class="font-weight-bold">
+                                {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}}
+                            </a>
+                        </td>
+                        <td class="px-2">{{ $appointment->client->displayName() }}</pre>
+                        </td>
+                        <td class="px-2">{{ $appointment->title }}</td>
+                        <td class="px-2">{{ $appointment->description }}</td>
+                        <td class="px-2">
+                            {{ $appointment->status }}
+                            @if($appointment->status_memo)
+                            <hr>
+                            {{$appointment->status_memo}}
+                            @endif
+                        </td>
+                        <td class="px-2">
+                            @include('app.patient.partials.appointment-confirmation',['patient' => $appointment->client])
+                        </td>
                     </tr>
                     @endforeach
 
@@ -52,4 +65,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection

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

@@ -7,7 +7,7 @@
 		min-width: 100px;
 	}
 </style>
-<form id="mcp-appointments-filters" method="GET" action="{{ route('mcp.appointments') }}" class="row align-items-end" v-cloak>
+<form id="mcp-appointments-filters" method="GET" action="{{ route('mcp.appointments') }}" class="row align-items-start" v-cloak>
 	   <!-- DATE -->
 	<div class="col-md-2">
 		<div class="form-group">
@@ -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="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+				</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="date" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -39,37 +35,41 @@
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
-				<option value="ALL">All</option>
-				<option value="NEW">New</option>
-				<option value="SIGNED">Signed</option>
-				<option value="VERIFIED">Verified</option>
-				<option value="PROCESSED">Processed</option>
-				<option value="CANCELLED">Cancelled</option>
-			</select>
-		</div>
-	</div>
-	
-	<!-- NEW/FU -->
-	<div class="col-md-2">
-		<div class="form-group">
-			<label>New or FU:</label>
-			<select name="new_or_fu" class="form-control input-sm" v-model="filters.new_or_fu">
-				<option value="ALL">All</option>
-				<option value="NEW">New</option>
-				<option value="FU">FU</option>
+				<option value="">All</option>
+				<option value="PENDING">PENDING</option>
+				<option value="CONFIRMED">CONFIRMED</option>
+				<option value="CANCELLED">CANCELLED</option>
+				<option value="COMPLETED">COMPLETED</option>
 			</select>
 		</div>
 	</div>
 
 	<div class="col-md-2">
-		<div class="form-group d-flex">
+		<div class="form-group">
 			<label>&nbsp;</label>
-			<button type="submit" class="btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
-			<a href="{{ route('mcp.patients') }}" class="btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			<div class="d-flex">
+				<button type="submit" 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.appointments')}}')" class="w-50 btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			</div>
 		</div>
 	</div>
 </form>
 
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'date_category',
+	'date_value_1',
+	'date_value_2',
+	'status'
+];
+for ($i=0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
+
 <script>
 	(function() {
 		function init() {
@@ -77,15 +77,15 @@
 				el: '#mcp-appointments-filters',
 				delimiters: ['@{{', '}}'],
 				data: {
-					filters: {
-						date_category: "<?= $date_category ?? '' ?>",
-						status: "<?= $status ?? '' ?>",
-						new_or_fu: "<?= $new_or_fu ?? '' ?>"
-					}
+					filters: <?= json_encode($loadedFilters) ?>
 				},
 				methods: {
+					doSubmit: function() {
+						fastLoad('{{ route("mcp.appointments") }}?' + $('#mcp-appointments-filters').serialize());
+						return false;
+					},
 					init: function() {
-						
+
 					}
 				},
 				mounted: function() {
@@ -97,4 +97,4 @@
 		}
 		addMCInitializer('mcp-appointments-filters', init, '#mcp-appointments-filters');
 	})();
-</script>
+</script>

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

@@ -22,17 +22,21 @@
                         <th class="px-3 border-0">Patient</th>
                         <th class="px-3 border-0">Service</th>
                         <th class="px-3 border-0">Amount</th>
-                        <th class="px-3 border-0">Status</th>
+                        <th class="px-3 border-0">Is Cancelled</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($bills as $bill)
                     <tr>
-                        <td>{{-- date --}} -</td>
-                        <td>{{-- patient --}} -</td>
-                        <td>{{-- service --}} - </td>
-                        <td>{{-- amount --}} - </td>                        
-                        <td>{{-- status --}} - </td>
+                        <td>{{ friendly_date_time($bill->effective_date) }}</td>
+                        <td>
+                            <a target="_blank" native href="{{route('patients.view.dashboard', $bill->client)}}">
+                                {{$bill->client->displayName()}}
+                            </a>
+                        </td>
+                        <td>{{ $bill->code }}</td>
+                        <td>{{ $bill->hcp_expected_payment_amount ? '$'.$bill->hcp_expected_payment_amount : '' }}</td>
+                        <td>{{ $bill->is_cancelled ? 'YES':'NO' }}</td>
                     </tr>
                     @endforeach
 
@@ -50,4 +54,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection

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

@@ -7,7 +7,7 @@
 		min-width: 100px;
 	}
 </style>
-<form id="mcp-bills-filters" method="GET" action="{{ route('mcp.notes') }}" class="row align-items-end" v-cloak>
+<form id="mcp-bills-filters" method="GET" action="{{ route('mcp.bills') }}" class="row align-items-start" v-cloak>
 	<!-- DATE	 -->
 	<div class="col-md-2">
 		<div class="form-group">
@@ -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="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+				</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="date" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -39,25 +35,37 @@
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
-				<option value="ALL">All</option>
-				<option value="NEW">New</option>
-				<option value="SIGNED">Signed</option>
-				<option value="VERIFIED">Verified</option>
-				<option value="PROCESSED">Processed</option>
+				<option value="">All</option>
 				<option value="CANCELLED">Cancelled</option>
+				<option value="NOT_CANCELLED">Not Cancelled</option>
 			</select>
 		</div>
 	</div>
 
 	<div class="col-md-2">
-		<div class="form-group d-flex">
+		<div class="form-group">
 			<label>&nbsp;</label>
-			<button type="submit" class="btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
-			<a href="{{ route('mcp.patients') }}" class="btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			<div class="d-flex">
+				<button type="submit" 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.bills')}}')" class="w-50 btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			</div>
 		</div>
 	</div>
 </form>
-
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'date_category',
+	'date_value_1',
+	'date_value_2',
+	'status'
+];
+for ($i = 0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
 <script>
 	(function() {
 		function init() {
@@ -65,12 +73,13 @@
 				el: '#mcp-bills-filters',
 				delimiters: ['@{{', '}}'],
 				data: {
-					filters: {
-						date_category: "<?= $date_category ?? '' ?>",
-						status: "<?= $status ?? '' ?>"
-					}
+					filters: <?= json_encode($loadedFilters) ?>
 				},
 				methods: {
+					doSubmit: function() {
+						fastLoad('{{ route("mcp.bills") }}?' + $('#mcp-bills-filters').serialize());
+						return false;
+					},
 					init: function() {
 
 					}
@@ -84,4 +93,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.blade.php

@@ -19,8 +19,10 @@
                 <thead class="bg-light">
                     <tr>
                         <th class="px-3 border-0">Date</th>
+                        <th class="px-3 border-0">Folder</th>
                         <th class="px-3 border-0">To</th>
                         <th class="px-3 border-0">From</th>
+                        <th class="px-3 border-0">Client</th>
                         <th class="px-3 border-0">Message</th>
                         <th class="px-3 border-0">Status</th>
                     </tr>
@@ -28,17 +30,19 @@
                 <tbody>
                     @foreach($clientMessages as $clientMessage)
                     <tr>
-                        <td>{{ $clientMessage->created_at }}</td>
-                        <td>{{$clientMessage->to}}</td>
-                        <td>{{$clientMessage->from}}</td>
-                        <td><?= nl2br($clientMessage->body) ?></td>                        
-                        <td>{{-- status --}} - </td>
+                        <td>{{ friendlier_date_time($clientMessage->created_at) }}</td>
+                        <td>{{ $clientMessage->incoming_or_outgoing }}</td>
+                        <td>{{$clientMessage->to_number}}</td>
+                        <td>{{$clientMessage->from_number}}</td>
+                        <td>{{ $clientMessage->client->displayName() }}</td>
+                        <td style="width:300px;"><?= nl2br($clientMessage->body) ?></td>                        
+                        <td>{{ $clientMessage->sms_status }} </td>
                     </tr>
                     @endforeach
 
                     @if(count($clientMessages) === 0)
                     <tr>
-                        <td colspan="5">No records found!</td>
+                        <td colspan="7">No records found!</td>
                     </tr>
                     @endif
                 </tbody>

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

@@ -7,7 +7,7 @@
 		min-width: 100px;
 	}
 </style>
-<form id="mcp-client-messages-filters" method="GET" action="{{ route('mcp.client_messages') }}" class="row align-items-end" v-cloak>
+<form id="mcp-client-messages-filters" method="GET" action="{{ route('mcp.client_messages') }}" class="row align-items-start" v-cloak>
 	<!-- DATE	 -->
 	<div class="col-md-2">
 		<div class="form-group">
@@ -20,22 +20,18 @@
 				<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="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+				</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="date" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- TO OR FROM ME -->
-	<div class="col-md-2">
+	<!-- <div class="col-md-2">
 		<div class="form-group">
 			<label>To or From Me:</label>
 			<select name="to_or_from_me" class="form-control input-sm" v-model="filters.to_or_from_me">
@@ -44,27 +40,44 @@
 				<option value="FROM_ME">From Me</option>
 			</select>
 		</div>
-	</div>
+	</div> -->
 	<!-- STATUS -->
 	<div class="col-md-2">
 		<div class="form-group">
 			<label>Status:</label>
-			<select name="status" class="form-control input-sm" v-model="filters.status">
-				<option value="ALL">All</option>
-				<option value="AWAITING_REPLY">AWaiting Reply</option>
+			<select name="sms_status" class="form-control input-sm" v-model="filters.sms_status">
+				<option value="">All</option>
+				<option value="received">Received</option>
 			</select>
 		</div>
 	</div>
 
 	<div class="col-md-2">
-		<div class="form-group d-flex">
+		<div class="form-group">
 			<label>&nbsp;</label>
-			<button type="submit" class="btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
-			<a href="{{ route('mcp.patients') }}" class="btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			<div class="d-flex">
+				<button type="submit" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
+				<a v-on:click.prevent="fastLoad('{{route('mcp.client_messages')}}')" href="#" class="w-50 btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			</div>
 		</div>
 	</div>
 </form>
 
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'date_category',
+	'date_value_1',
+	'date_value_2',
+	'sms_status'
+];
+for ($i=0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
+
 <script>
 	(function() {
 		function init() {
@@ -72,13 +85,13 @@
 				el: '#mcp-client-messages-filters',
 				delimiters: ['@{{', '}}'],
 				data: {
-					filters: {
-						date_category: "<?= $date_category ?? '' ?>",
-						to_or_from_me: "<?= $to_or_from_me ?? '' ?>",
-						status: "<?= $status ?? '' ?>"
-					}
+					filters: <?= json_encode($loadedFilters) ?>
 				},
 				methods: {
+					doSubmit: function() {
+						fastLoad('{{ route("mcp.client_messages") }}?' + $('#mcp-client-messages-filters').serialize());
+						return false;
+					},
 					init: function() {
 
 					}
@@ -92,4 +105,4 @@
 		}
 		addMCInitializer('mcp-client-messages-filters', init, '#mcp-client-messages-filters');
 	})();
-</script>
+</script>

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

@@ -20,23 +20,60 @@
                     <tr>
                         <th class="px-3 border-0">Date</th>
                         <th class="px-3 border-0">Patient</th>
+                        <th class="border-bottom-0">Category</th>
                         <th class="px-3 border-0">Content</th>
                         <th class="px-3 border-0">Status</th>
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach($erxAndOrders as $erxAndOrder)
+                    @foreach($erxAndOrders as $row)
                     <tr>
-                        <td>{{-- date --}} -</td>
-                        <td>{{-- patient --}} -</td>
-                        <td>{{-- content --}} - </td>
-                        <td>{{-- status --}} - </td>
+                        <td>{{ friendly_date_time($row->created_at) }}</td>
+                        <td>
+                            <a target="_blank" native href="{{route('patients.view.dashboard', $row->client)}}">
+                                {{$row->client->displayName()}}
+                            </a>
+                        </td>
+                        <td>{{ ucwords($row->erx_category) }}</td>
+                        <td>
+                            <?php $parsed = @$row->clinical_detail_json ? json_decode($row->clinical_detail_json) : false; ?>
+                            @if($row->erx_category === 'DRUG')
+                                <?php
+                                $drugs = ($parsed && @$parsed->items) ? $parsed->items : [];
+                                ?>
+                                @foreach($drugs as $drug)
+                                    <div class="d-flex align-items-baseline mb-1">
+                                        <b class="mr-2">{{$drug->medication ?? '-'}}</b>
+                                        <span class="text-secondary mr-1">{{$drug->frequency ?? ''}}</span>
+                                    </div>
+                                @endforeach
+                            @elseif($row->erx_category === 'LAB' || $row->erx_category === 'IMAGING')
+                                <?php
+                                $tests = ($parsed && @$parsed->tests) ? $parsed->tests : [];
+                                ?>
+                                @foreach($tests as $test)
+                                    <div class="d-flex align-items-baseline mb-1">
+                                        <b class="mr-2">{{$test ?? '-'}}</b>
+                                    </div>
+                                @endforeach
+                            @elseif($row->erx_category === 'REFERRAL')
+                                <b class="mr-2">{{@$parsed->to ?? '-'}}</b>
+                                <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
+                            @elseif($row->erx_category === 'SUPPLY')
+                                <b class="mr-2">{{@$parsed->item ?? '-'}}</b>
+                                <span class="text-secondary mr-1">{{@$parsed->quantity ?? '-'}}</span>
+                            @elseif($row->erx_category === 'OTHER')
+                                <b class="mr-2">{{@$parsed->title ?? '-'}}</b>
+                                <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
+                            @endif
+                        </td>
+                        <td>{{ $row->pro_declared_status ?: '-' }}</td>
                     </tr>
                     @endforeach
 
                     @if(count($erxAndOrders) === 0)
                     <tr>
-                        <td colspan="4">No records found!</td>
+                        <td colspan="5">No records found!</td>
                     </tr>
                     @endif
                 </tbody>

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

@@ -7,7 +7,7 @@
 		min-width: 100px;
 	}
 </style>
-<form id="mcp-erx-and-orders-filters" method="GET" action="{{ route('mcp.notes') }}" class="row align-items-end" v-cloak>
+<form id="mcp-erx-and-orders-filters" method="GET" action="{{ route('mcp.notes') }}" class="row align-items-start" v-cloak>
 	<!-- DATE	 -->
 	<div class="col-md-2">
 		<div class="form-group">
@@ -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="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+				</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="date" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -39,25 +35,40 @@
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
-				<option value="ALL">All</option>
-				<option value="NEW">New</option>
-				<option value="SIGNED">Signed</option>
-				<option value="VERIFIED">Verified</option>
-				<option value="PROCESSED">Processed</option>
-				<option value="CANCELLED">Cancelled</option>
+				<option value="">All</option>
+				<option value="CREATED">CREATED</option>
+				<option value="SENT">SENT</option>
+				<option value="RECEIVED_BY_CLIENT">RECEIVED BY CLIENT</option>
+				<option value="RECEIPT_CONFIRMED_BY_FACILITY">RECEIPT CONFIRMED BY FACILITY</option>
+				<option value="CANCELLED">CANCELLED</option>
 			</select>
 		</div>
 	</div>
 
 	<div class="col-md-2">
-		<div class="form-group d-flex">
+		<div class="form-group">
 			<label>&nbsp;</label>
-			<button type="submit" class="btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
-			<a href="{{ route('mcp.patients') }}" class="btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			<div class="d-flex">
+				<button type="submit" 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.erx_and_orders')}}')" class="w-50 btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			</div>
 		</div>
 	</div>
 </form>
-
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'date_category',
+	'date_value_1',
+	'date_value_2',
+	'status'
+];
+for ($i=0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
 <script>
 	(function() {
 		function init() {
@@ -65,12 +76,13 @@
 				el: '#mcp-erx-and-orders-filters',
 				delimiters: ['@{{', '}}'],
 				data: {
-					filters: {
-						date_category: "<?= $date_category ?? '' ?>",
-						status: "<?= $status ?? '' ?>"
-					}
+					filters: <?= json_encode($loadedFilters) ?>
 				},
 				methods: {
+					doSubmit: function() {
+						fastLoad('{{ route("mcp.erx_and_orders") }}?' + $('#mcp-erx-and-orders-filters').serialize());
+						return false;
+					},
 					init: function() {
 
 					}
@@ -84,4 +96,4 @@
 		}
 		addMCInitializer('mcp-erx-and-orders-filters', init, '#mcp-erx-and-orders-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/measurements_pending_stamping.blade.php

@@ -3,7 +3,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0 hide-inside-popup">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Measurements Pending Stamping
             </strong>
         </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.blade.php

@@ -18,25 +18,58 @@
             <table class="table table-condensed p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
+                        <th class="px-3 border-0">Effective Date</th>
                         <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">ICD</th>
-                        <th class="px-3 border-0">Status</th>
+                        <th class="px-3 border-0">New Patient / FU</th>
+
+                        <th class="px-3 border-0">HCP</th>
+
+                        <th class="px-3 border-0">HCP Signed</th>
+                        <th class="px-3 border-0">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach($notes as $note)
-                    <tr>
-                        <td>{{-- date --}} -</td>
-                        <td>{{-- patient --}} - </td>
-                        <td>{{-- ICD --}} - </td>
-                        <td>{{-- Status --}} - </td>
+                    @foreach ($notes as $note)
+                    <tr class="{{ $note->is_cancelled ? 'cancelled-item always-clickable' : '' }}">
+                        <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) }}
+                            </a>
+                            @if(!!$note->visitTemplate)
+                            <span class="text-info font-weight-bold">*</span>
+                            @endif
+                            <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>
+                        </td>
+                        <td class="px-2">
+                            {{ $note->client->displayName() }}
+                        </td>
+
+                        <td class="px-2">
+                            {{ $note->new_or_fu_or_na === 'NEW' ? 'New Patient' : $note->new_or_fu_or_na }}
+                        </td>
+
+                        <td class="px-2">
+                            {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
+                        </td>
+
+                        <td class="px-2">
+                            {!! $note->hcpPro && $note->is_signed_by_hcp ? '<b class="text-success">Yes</b>' : 'No' !!}
+                        </td>
+                        <td class="px-2">
+                            <div class="position-relative c-pointer text-center stag-tooltip">
+                                <i class="fa fa-info-circle"></i>
+                                <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+                                    <div class="text-nowrap small text-left pb-1">Created on <b>{{ friendly_date_time($note->created_at, true) }}</b></div>
+                                    <div class="text-nowrap small text-left">Created by <b>{{ $note->createdSession->pro->displayName() }}</b></div>
+                                </div>
+                            </div>
+                        </td>
                     </tr>
                     @endforeach
 
                     @if(count($notes) === 0)
                     <tr>
-                        <td colspan="5">No records found!</td>
+                        <td colspan="6">No records found!</td>
                     </tr>
                     @endif
                 </tbody>
@@ -48,4 +81,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection

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

@@ -7,7 +7,7 @@
 		min-width: 100px;
 	}
 </style>
-<form id="mcp-notes-filters" method="GET" action="{{ route('mcp.notes') }}" class="row align-items-end" v-cloak>
+<form id="mcp-notes-filters" method="GET" action="{{ route('mcp.notes') }}" class="row align-items-start" v-cloak>
 	<!-- DATE	 -->
 	<div class="col-md-2">
 		<div class="form-group">
@@ -20,43 +20,52 @@
 				<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="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+				</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="date" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
 	<div class="col-md-2">
 		<div class="form-group">
-			<label>Status:</label>
-			<select name="status" class="form-control input-sm" v-model="filters.status">
-				<option value="ALL">All</option>
+			<label>New/FU:</label>
+			<select name="new_or_fu_or_na" class="form-control input-sm" v-model="filters.new_or_fu_or_na">
+				<option value="">All</option>
 				<option value="NEW">New</option>
-				<option value="SIGNED">Signed</option>
-				<option value="VERIFIED">Verified</option>
-				<option value="PROCESSED">Processed</option>
-				<option value="CANCELLED">Cancelled</option>
+				<option value="FU">FU</option>
 			</select>
 		</div>
-	</div>	
+	</div>
 
 	<div class="col-md-2">
-		<div class="form-group d-flex">
+		<div class="form-group">
 			<label>&nbsp;</label>
-			<button type="submit" class="btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
-			<a href="{{ route('mcp.patients') }}" class="btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			<div class="d-flex">
+				<button type="submit"  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.notes')}}')" class="w-50 btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			</div>
 		</div>
 	</div>
 </form>
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'date_category',
+	'date_value_1',
+	'date_value_2',
+	'new_or_fu_or_na'
+];
+for ($i=0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
 
 <script>
 	(function() {
@@ -65,14 +74,15 @@
 				el: '#mcp-notes-filters',
 				delimiters: ['@{{', '}}'],
 				data: {
-					filters: {
-						date_category: "<?= $date_category ?? '' ?>",						
-						status: "<?= $status ?? '' ?>"
-					}
+					filters: <?= json_encode($loadedFilters) ?>
 				},
 				methods: {
+					doSubmit: function() {
+						fastLoad('{{ route("mcp.notes") }}?' + $('#mcp-notes-filters').serialize());
+						return false;
+					},
 					init: function() {
-						
+
 					}
 				},
 				mounted: function() {
@@ -80,8 +90,7 @@
 				},
 			});
 
-
 		}
 		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.blade.php

@@ -1,5 +1,72 @@
 @extends ('layouts/template')
 
 @section('content')
-    <h1>Hi</h1>
-@endsection
+<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">
+            <strong class="mr-4">
+                <i class="fas fa-file-invoice-dollar"></i>
+                Reports Pending Signature
+            </strong>
+        </div>
+
+        <div class="card-body p-0">
+            <div class="p-3">
+                @include('app.mcp.reports_filters')
+            </div>
+            <table class="table table-condensed p-0 m-0">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="px-3 border-0">Patient</th>
+                        <th class="px-3 border-0">Title</th>
+                        <th class="px-3 border-0">Category</th>
+                        <th class="px-3 border-0">Report Date</th>
+                        <th class="px-3 border-0">Sign</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach($reports as $report)
+                    <tr class="{{$report->is_entry_error ? 'entry-error' : ''}}">
+                        <td class="border-bottom-0">{{$report->client->displayName()}}</td>
+                        <td>
+                            <a native target="_blank" href="{{route('patients.view.incoming-reports', ['patient' => $report->client, 'currentReport' => $report])}}" class="{{@$currentReport->uid === $report->uid ? 'font-weight-bold' : ''}}">
+                                {{ $report->title ? $report->title : '(not set)' }}
+                            </a>
+                        </td>
+                        <td>{{ $report->category }}{{ $report->subcategory ? ' / ' . $report->subcategory : '' }}</td>
+                        <td>{{ friendly_date_time($report->report_date, false) }}</td>
+                        <td>
+                            @if(!$report->has_hcp_pro_signed)
+                            -
+                            @else
+                            <div class="text-success mb-1">
+                                <i class="fa fa-check"></i>
+                                Signed
+                            </div>
+                            @if($report->hcp)
+                            <div class="text-secondary">
+                                <div class="text-sm font-weight-bold">{{$report->hcp->displayName()}}</div>
+                                <div class="text-sm">{{friendlier_date_time($report->hcp_pro_signed_at)}}</div>
+                            </div>
+                            @endif
+                            @endif
+                        </td>
+                    </tr>
+                    @endforeach
+
+                    @if(count($reports) === 0)
+                    <tr>
+                        <td colspan="5">No records found!</td>
+                    </tr>
+                    @endif
+                </tbody>
+
+            </table>
+            <div class="ml-2 mt-2">
+                {{ $reports->appends(request()->input())->links() }}
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

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

@@ -0,0 +1,96 @@
+<style>
+	#mcp-reports-filters label {
+		font-weight: bold;
+	}
+
+	#mcp-reports-filters .mw-100px {
+		min-width: 100px;
+	}
+</style>
+<form id="mcp-reports-filters" method="GET" action="{{ route('mcp.reports') }}" class="row align-items-start" v-cloak>
+	<!-- DATE	 -->
+	<div class="col-md-2">
+		<div class="form-group">
+			<label>Date:</label>
+			<select name="date_category" class="form-control input-sm" v-model="filters.date_category">
+				<option value="">All</option>
+				<option value="EXACTLY">Exactly</option>
+				<option value="LESS_THAN">Less Than</option>
+				<option value="GREATER_THAN">Greater Than</option>
+				<option value="BETWEEN">Between</option>
+				<option value="NOT_BETWEEN">Not Between</option>
+			</select>
+			<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="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+				</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="date" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- STATUS -->
+	<div class="col-md-2">
+		<div class="form-group">
+			<label>Status:</label>
+			<select name="status" class="form-control input-sm" v-model="filters.status">
+				<option value="">All</option>
+				<option value="SIGNED">Signed</option>
+				<option value="NOT_SIGNED">Not Signed</option>
+			</select>
+		</div>
+	</div>
+
+	<div class="col-md-2">
+		<div class="form-group">
+			<label>&nbsp;</label>
+			<div class="d-flex">
+				<button type="submit" 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.reports')}}')" class="w-50 btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			</div>
+		</div>
+	</div>
+</form>
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'date_category',
+	'date_value_1',
+	'date_value_2',
+	'status'
+];
+for ($i = 0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
+<script>
+	(function() {
+		function init() {
+			window.apapp = new Vue({
+				el: '#mcp-reports-filters',
+				delimiters: ['@{{', '}}'],
+				data: {
+					filters: <?= json_encode($loadedFilters) ?>
+				},
+				methods: {
+					doSubmit: function() {
+						fastLoad('{{ route("mcp.reports") }}?' + $('#mcp-reports-filters').serialize());
+						return false;
+					},
+					init: function() {
+
+					}
+				},
+				mounted: function() {
+					this.init();
+				},
+			});
+
+
+		}
+		addMCInitializer('mcp-reports-filters', init, '#mcp-reports-filters');
+	})();
+</script>

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.blade.php

@@ -22,23 +22,40 @@
                         <th class="px-3 border-0">Patient</th>
                         <th class="px-3 border-0">Product</th>
                         <th class="px-3 border-0">Reason</th>
-                        <th class="px-3 border-0">Status</th>
+                        <th class="px-3 border-0">Is Cancelled</th>
+                        <th class="px-3 border-0">Shipment</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($supplyOrders as $supplyOrder)
                     <tr>
-                        <td>{{-- date --}} -</td>
-                        <td>{{-- patient --}} -</td>
-                        <td>{{-- service --}} - </td>
-                        <td>{{-- amount --}} - </td>
-                        <td>{{-- status --}} - </td>
+                        <td>{{ friendlier_date_time($supplyOrder->created_at)}}</td>
+                        <td>{{ $supplyOrder->client->displayName() }} -</td>
+                        <td>{{ $supplyOrder->product->title }}</td>
+                        <td style="width: 300px;">{{ $supplyOrder->reason }}</td>
+                        <td>{{ $supplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
+                        <td class="px-2">
+                            @if($supplyOrder->shipment_id)
+                            <i class="fa fa-building"></i>
+                            {{$supplyOrder->shipment->status ? $supplyOrder->shipment->status : 'CREATED'}}
+                            @elseif($supplyOrder->is_cleared_for_shipment)
+                            <span class="text-info">
+                                <i class="fa fa-user-nurse"></i>
+                                Cleared for shipment
+                            </span>
+                            @else
+                            <span class="text-warning-mellow">
+                                <i class="fa fa-user-nurse"></i>
+                                Not cleared for shipment
+                            </span>
+                            @endif
+                        </td>
                     </tr>
                     @endforeach
 
                     @if(count($supplyOrders) === 0)
                     <tr>
-                        <td colspan="5">No records found!</td>
+                        <td colspan="6">No records found!</td>
                     </tr>
                     @endif
                 </tbody>

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

@@ -7,7 +7,7 @@
 		min-width: 100px;
 	}
 </style>
-<form id="mcp-supply-orders-filters" method="GET" action="{{ route('mcp.notes') }}" class="row align-items-end" v-cloak>
+<form id="mcp-supply-orders-filters" method="GET" action="{{ route('mcp.supply_orders') }}" class="row align-items-start" v-cloak>
 	<!-- DATE	 -->
 	<div class="col-md-2">
 		<div class="form-group">
@@ -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="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+				</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="date" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -39,25 +35,50 @@
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
-				<option value="ALL">All</option>
-				<option value="NEW">New</option>
-				<option value="SIGNED">Signed</option>
-				<option value="VERIFIED">Verified</option>
-				<option value="PROCESSED">Processed</option>
-				<option value="CANCELLED">Cancelled</option>
+				<option value="">All</option>
+				<option value="CREATED">NEW</option>
+				<option value="CLEARED_FOR_SHIPMENT">CLEARED FOR SHIPMENT</option>
+				<option value="NOT_CLEARED_FOR_SHIPMENT">NOT CLEARED FOR SHIPMENT</option>
+				<option value="SHIPPED">SHIPPED</option>
+				<option value="DELIVERED">DELIVERED</option>
+				<option value="RETURNED_TO_SENDER">RETURNED TO SENDER</option>
+				<option value="CANCELLED">CANCELLED</option>
+				<option value="PRINTED">PRINTED</option>
+				<option value="BEING_PICKED">BEING PICKED</option>
+				<option value="PICKED">PICKED</option>
+				<option value="BEING_SCANNED">BEING SCANNED</option>
+				<option value="SCANNED">SCANNED</option>
+				<option value="BEING_FULFILLED">BEING FULFILLED</option>
+				<option value="FULFILLED">FULFILLED</option>
+				<option value="DISPATCHED">DISPATCHED</option>
 			</select>
 		</div>
 	</div>
 
 	<div class="col-md-2">
-		<div class="form-group d-flex">
+		<div class="form-group">
 			<label>&nbsp;</label>
-			<button type="submit" class="btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
-			<a href="{{ route('mcp.patients') }}" class="btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			<div class="d-flex">
+				<button type="submit" 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.supply_orders')}}')" class="w-50 btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			</div>
 		</div>
 	</div>
 </form>
-
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'date_category',
+	'date_value_1',
+	'date_value_2',
+	'status'
+];
+for ($i=0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
 <script>
 	(function() {
 		function init() {
@@ -65,12 +86,13 @@
 				el: '#mcp-supply-orders-filters',
 				delimiters: ['@{{', '}}'],
 				data: {
-					filters: {
-						date_category: "<?= $date_category ?? '' ?>",
-						status: "<?= $status ?? '' ?>"
-					}
+					filters: <?= json_encode($loadedFilters) ?>
 				},
 				methods: {
+					doSubmit: function() {
+						fastLoad('{{ route("mcp.supply_orders") }}?' + $('#mcp-supply-orders-filters').serialize());
+						return false;
+					},
 					init: function() {
 
 					}
@@ -84,4 +106,4 @@
 		}
 		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/app/practice-management/bill-matrix.blade.php

@@ -7,7 +7,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>
                 Bills
             </strong>
             <a href="/practice-management/bill-matrix" class="ml-auto">Clear Filters</a>

resources/views/app/practice-management/billing-manager-v1.blade.php

@@ -8,7 +8,7 @@
 
             <div class="card-header px-3 py-2 d-flex align-items-center">
                 <strong class="mr-4 font-size-14">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Billing Manager
                     @if(request()->input('date'))
                         - Notes on {{friendlier_date(request()->input('date'))}}

resources/views/app/practice-management/billing-manager.blade.php

@@ -8,7 +8,7 @@
 
             <div class="card-header px-3 py-2 d-flex align-items-center">
                 <strong class="mr-4 font-size-14">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Billing Manager
                     @if(request()->input('date'))
                         - Notes on {{friendlier_date(request()->input('date'))}}

resources/views/app/practice-management/billing-report.blade.php

@@ -7,7 +7,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>
                 Note Billing Report
             </strong>
         </div>

resources/views/app/practice-management/bills-under-processing.blade.php

@@ -8,7 +8,7 @@
 
             <div class="card-header px-3 py-2">
                 <div class="font-weight-bold text-nowrap mb-2">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Bills Under Processing
                 </div>
             </div>

resources/views/app/practice-management/bills.blade.php

@@ -7,7 +7,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>
                 Bills
             </strong>
             <select class="ml-auto max-width-300px form-control form-control-sm" onchange="fastLoad('/practice-management/bills/' + this.value, true, false, false)">

resources/views/app/practice-management/care-month-report.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>
                     Care Month Report: {{date('M Y', strtotime($date))}}
                 </strong>
                 <div class="ml-auto">

resources/views/app/practice-management/cellular-device-manager.blade.php

@@ -8,7 +8,7 @@
 
             <div class="card-header px-3 py-2 d-flex align-items-center">
                 <strong class="mr-4 flex-grow-1">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Cellular Device Manager
                 </strong>
                 <div class="width-200px ml-auto">

resources/views/app/practice-management/claims-pdf.blade.php

@@ -3,7 +3,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>
                 Claims
             </strong>
             <a href="{{route('practice-management.download-claims')}}">Download</a>

resources/views/app/practice-management/dna-notes-pending-mcp-sign.blade.php

@@ -7,7 +7,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>
                 Notes Pending MCP Sign
             </strong>
         </div>

resources/views/app/practice-management/financial-transactions.blade.php

@@ -5,7 +5,7 @@
         <div class="card">
             <div class="card-header p-3 d-flex align-items-center">
                 <strong class="mr-4">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Financial Transactions
                 </strong>
                 <div class="ml-auto">

resources/views/app/practice-management/handouts.blade.php

@@ -7,7 +7,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Handouts
             </strong>
             <span class="mx-2 text-secondary">|</span>

resources/views/app/practice-management/hcp-bill-matrix.blade.php

@@ -8,7 +8,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>
                     HCP Bill Matrix
                 </strong>
                 <select class="ml-auto max-width-300px form-control form-control-sm"

resources/views/app/practice-management/mc-code-checks.blade.php

@@ -5,7 +5,7 @@
         <div class="card">
             <div class="card-header p-3 d-flex align-items-center">
                 <strong class="mr-4">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     MC Code Checks
                 </strong>
             </div>

resources/views/app/practice-management/medicare-partb-claims.blade.php

@@ -7,7 +7,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>
                     Claims
                 </strong>
                 <a native href="{{route('practice-management.download-claims')}}" target="_blank">Download</a>

resources/views/app/practice-management/my-favorites.blade.php

@@ -7,7 +7,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Favorites
             </strong>
             <span class="ml-3 text-secondary">

resources/views/app/practice-management/my-teams.blade.php

@@ -7,7 +7,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>
                 My Teams
             </strong>
         </div>

resources/views/app/practice-management/my-text-shortcuts.blade.php

@@ -7,7 +7,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Text Shortcuts
             </strong>
             <span class="mx-2 text-secondary">|</span>

resources/views/app/practice-management/my-tickets.blade.php

@@ -7,7 +7,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 My Tickets
             </strong>
             <select class="ml-auto max-width-300px form-control form-control-sm"

resources/views/app/practice-management/na-billable-signed-notes.blade.php

@@ -7,7 +7,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>
                 Billable Signed Notes ({{count($notes)}})
             </strong>
         </div>

resources/views/app/practice-management/notes-processing-center.blade.php

@@ -12,7 +12,7 @@
 
             <div class="card-header p-2 d-flex align-items-center">
                 <strong class="mr-4">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Notes Processing Center
                 </strong>
             </div>

resources/views/app/practice-management/notes.blade.php

@@ -7,7 +7,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>
                 Notes
             </strong>
             <select class="ml-auto max-width-300px form-control form-control-sm" onchange="fastLoad('/practice-management/notes/' + this.value, true, false, false)">

resources/views/app/practice-management/patient-claim-summary.blade.php

@@ -119,7 +119,7 @@
 
             <div class="card-header px-3 py-2 d-flex align-items-center">
                 <strong class="mr-4 d-inline-block">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Patient Claim Summary
                 </strong>
                 <select class="ml-auto max-width-300px form-control form-control-sm d-inline-block"

resources/views/app/practice-management/patients-without-coverage.blade.php

@@ -7,7 +7,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Patients pending coverage info/verification
             </strong>
             <select class="ml-auto max-width-300px form-control form-control-sm"

resources/views/app/practice-management/pro-availability.blade.php

@@ -584,7 +584,7 @@
             <div class="card">
                 <div class="card-header px-3 py-2 d-flex align-items-center">
                     <strong class="">
-                        <i class="fas fa-user-injured"></i>
+                        <i class="fas fa-user"></i>
                         Pro Availability
                     </strong>
                     <div class="ml-auto d-inline-flex align-items-center">

resources/views/app/practice-management/pro-financials.blade.php

@@ -8,7 +8,7 @@
 
             <div class="card-header px-3 py-2 d-flex align-items-center">
                 <strong class="text-nowrap">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Pro Financials
                 </strong>
                 <span class="mx-2">for</span>

resources/views/app/practice-management/processing-bill-matrix.blade.php

@@ -8,7 +8,7 @@
 
             <div class="card-header px-3 py-2">
                 <div class="font-weight-bold text-nowrap mb-2">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Processing Bills
                 </div>
                 <div class="d-flex align-items-center mb-2">

resources/views/app/practice-management/rates.blade.php

@@ -7,7 +7,7 @@
 
             <div class="card-header px-3 py-2 d-flex align-items-center">
                 <strong class="text-nowrap">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Payment Rates
                 </strong>
                 <span class="mx-2">for</span>

resources/views/app/practice-management/remote-monitoring-report.blade.php

@@ -5,7 +5,7 @@
         <div class="card">
             <div class="card-header p-3 d-flex align-items-center">
                 <strong class="mr-4">
-                    <i class="fas fa-user-injured"></i>
+                    <i class="fas fa-user"></i>
                     Remote Monitoring Report
                 </strong>
             </div>

resources/views/app/practice-management/rm-bills-to-sign.blade.php

@@ -7,7 +7,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>
                 RM Bills to Sign
             </strong>
             @if($pro->is_hcp && $bills && count($bills))

resources/views/app/practice-management/tickets.blade.php

@@ -7,7 +7,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>
                 Tickets
             </strong>
             

resources/views/app/practice-management/unacknowledged-cancelled-bills.blade.php

@@ -7,7 +7,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="mr-4 font-size-16">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Unacknowledged Cancelled Bills
             </strong>
         </div>

resources/views/app/unmapped-sms.blade.php

@@ -7,7 +7,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>
                 Unmapped SMS
             </strong>
             {{--<select class="ml-auto max-width-300px form-control form-control-sm" onchange="fastLoad('/patients/' + this.value, true, false, false)">

resources/views/layouts/patient.blade.php

@@ -6,6 +6,11 @@
 $routeName = request()->route()->getName();
 $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note && !!$note->visitTemplate);
 ?>
+<style media="screen">
+	.pt-name {
+		font-size: 1.5rem !important;
+	}
+</style>
 @section('content')
 	<div class="container-fluid h-100">
 		<div class="main-row h-100 {{ !request()->input('popupmode') ? '' : 'px-0' }} {{$isVisitNote ? 'autohide-leftnav' : ''}}">
@@ -305,7 +310,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 					</div>
 				@endif
 				<div class="card {{$isVisitNote ? 'card m-0 border-0 rounded-0' : 'my-3'}}" id="patient-header">
-					<div class="card-header py-1 hide-inside-ticket-popup hide-inside-popup">
+					<div class="card-header py-1 hide-inside-ticket-popup">
 						<?php
 						$thumbnail = $patient->profile_picture_base64;
 						$initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
@@ -339,10 +344,8 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 										</a>
 									</div>
 								@endif
-								<div class=hbox>
-									<div class="screen-only mr-1 patient-presence-indicator thumbnail {{$online}}"
-										 data-patient-uid="{{$patient->uid}}"
-										 style="background-image:<?=$thumbnail?>"><?=$initials?></div>
+								<div class="hbox justify-content-between">
+
 									{{--<div>
 										<div @if($patient->is_microphone_available)style="color:green" @else style="color:gray"  @endif>
 											<i class="fa fa-microphone"></i>
@@ -352,8 +355,11 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 										</div>
 									</div>--}}
 									<section>
-										<div class=hbox>
-											<h4>{{$patientName}}</h4>
+										<div class="hbox">
+											<h4 class="pt-name">{{$patientName}}</h4>
+											<div class="screen-only mr-1 patient-presence-indicator thumbnail {{$online}}"
+											data-patient-uid="{{$patient->uid}}"
+											style="background-image:<?=$thumbnail?>"><?=$initials?></div>
 											<i class=chart>[#{{$patient->chart_number}}]</i>
 										</div>
 										<div class=separators>
@@ -515,19 +521,19 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 														<div class="mb-2">
 															<label class="text-secondary text-sm">Remove Physician 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
-                                        </div>
+                                          </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
+                      </div>
 											<div>
 												<label>Engagement Status:</label>
 												<b>{{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category))) : '-'}}</b>
@@ -621,7 +627,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                                     <section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-4">
 
                                         <div moe>
-                                            <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note
+                                            <button class="col-2-button" start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note
                                             </button>
                                             <form url="/api/note/createUsingTemplate"
                                                   redir="/patients/view/{{$patient->uid}}/notes/view/[data]"
@@ -672,7 +678,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                                         </div>
                                         <div>
                                             <div moe relative>
-                                                <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS
+                                                <button class="col-2-button" start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS
                                                 </button>
                                                 <form url="/api/clientSms/createOutgoing" right class="mcp-theme-1">
                                                     <input type="hidden" name="uid" value="{{ $patient->uid }}">
@@ -699,7 +705,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                                         </div>
                                         <div>
                                         <span moe relative class="">
-                                            <button start show title="SMS check-in link to the patient">Send&nbsp;<i
+                                            <button class="col-2-button" start show title="SMS check-in link to the patient">Send&nbsp;<i
                                                     class="on-hover-opaque fa fa-paper-plane text-secondary"></i></button>
                                             <form url="/api/client/sendCheckInTokenViaSmsOrEmail" right
                                                   class="mcp-theme-1">
@@ -725,24 +731,21 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                                             </form>
                                         </span>
                                         </div>
-                                    </section>
-									
-                                    <section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-1">
-                                        @if($performer->pro->pro_type == 'ADMIN')
-                                        <div>
-                                            <button class="col-2-button" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')">Check Video</button>
-                                        </div>
-                                        @endif
-										<div>
-											<button class="col-2-button" onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Join Video</button>
-										</div>
+																				@if($performer->pro->pro_type == 'ADMIN')
+																				<div>
+																					<button class="col-2-button" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')">Check Video</button>
+																				</div>
+																				@endif
+																				<div>
+																					<button class="col-2-button" onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Join Video</button>
+																				</div>
                                     </section>
 
 									<section class="hide-inside-popup screen-only vbox align-self-start mt-2 mx-2">
 										@include('app.patient.coverage-status')
 									</section>
 
-									<ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
+									<ul class="vbox mt-2 align-self-start patient-header-address">
 										<li class="d-flex align-items-start">
 											<span class="aligned-icon">
 												<i class="fa fa-map-marker-alt" aria-hidden="true"></i>
@@ -885,6 +888,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