Updates

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

@@ -1,5 +1,5 @@
-<table class="table table-condensed p-0 m-0">
-	<thead class="bg-light">
+<table class="table table-sm table-striped p-0 m-0">
+	<thead class="bg-light border-top">
 		<tr>
 			<th class="px-3 border-0">#</th>
 			<th class="px-3 border-0">Name</th>
@@ -9,11 +9,7 @@
 			<th class="px-3 border-0">BMI</th>
 			<th class="px-3 border-0">Insurance</th>
 			<th class="px-3 border-0">MCP</th>
-			<th class="px-3 border-0">Last Visit</th>
-			<th class="px-3 border-0">Next Appt.</th>
-			<th class="px-3 border-0">Status</th>
 			<th class="px-3 border-0">RPM</th>
-			<th class="px-3 border-0">Assigned On</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -59,7 +55,7 @@
 			</td>
 			<td>
 				<div class="d-flex flex-column">
-					<span>{{ $patient->mcp->displayName() }}</span>					
+					<span>{{ $patient->mcp ? $patient->mcp->displayName() :'' }}</span>					
 					@if($patient->mostRecentCompletedMcpNote)
 						<span>Last Encounter:  
 						<a href="/patients/view/{{ $patient->mostRecentCompletedMcpNote->client->uid }}/notes/view/{{ $patient->mostRecentCompletedMcpNote->uid }}" class="font-weight-bold">
@@ -68,7 +64,7 @@
 						</span>
 					@endif
 					@if($patient->next_mcp_appointment_date)
-						<span>Next Appt. {{ friendly_date_time($patient->next_mcp_appointment_date) }}</span>
+						<span class="text-muted">Next Appt. <b>{{ friendly_date_time($patient->next_mcp_appointment_date) }}</b></span>
 					@endif
 					<?= $recentNote = $patient->mostRecentCompletedMcpNote; ?>
 					@if($recentNote)
@@ -80,25 +76,25 @@
 					@endif
 				</div>
 			</td>
-			<td>{{$patient->lastMcpAppointment ? friendly_date_time($patient->lastMcpAppointment->raw_date.' '.$patient->lastMcpAppointment->raw_start_time) : '-'}}</td>
-			<td>{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : '-'}}</td>
-			<td>{{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}</td>
 			<td>
 			   <div class="d-flex flex-column">
 			   		<span>Enrolled: {{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</span>
-				<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>
+				<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)');?>
+				@if($m)
 				<span>Wt. (lbs.) {{$m && $m->value ? round($m->value, 2) : '-'}}</span>
+				@endif
 				<?php $bp = $patient->lastMeasurementOfType('BP'); ?>
+				@if($bp)
 				<span>BP. {{$bp && $bp->value ? $bp->value : '-'}}</span>
+				@endif
 			   </div>
 			</td>
-			<td>{{$patient->getMcpAssignedOn()}}</td>
 		</tr>
 		@endforeach
 
 		@if(count($patients) === 0)
 		<tr>
-			<td colspan="16">No records found!</td>
+			<td colspan="9">No records found!</td>
 		</tr>
 		@endif
 	</tbody>