unknown %!s(int64=3) %!d(string=hai) anos
pai
achega
297991ae23

+ 27 - 4
resources/views/app/mcp/patients-table.blade.php

@@ -1,3 +1,9 @@
+<style>
+    td, th {
+        text-align: center !important;
+    }
+</style>
+
 <table class="table table-condensed p-0 m-0">
 	<thead class="bg-light">
 		<tr>
@@ -11,11 +17,28 @@
 			<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">CCM</th>
-			<th class="px-3 border-0">RPM</th>
+{{--			<th class="px-3 border-0">CCM</th>--}}
+{{--			<th class="px-3 border-0">RPM</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>
+
+            <th>Name</th>
+            <th>DOB</th>
+            @if($pro->pro_type == 'ADMIN')
+                <th>MCP</th>
+            @endif
+            <th>BP</th>
+            <th> <i class="fa fa-heartbeat"></i> </th>
+            <th>Pulse</th>
+            <th>BP/Pulse Timestamp</th>
+            <th>BP <i class="fa fa-car-battery"></i></th>
+            <th>BP <i class="fa fa-broadcast-tower"></i></th>
+            <th>Weight</th>
+            <th>Weight Timestamp</th>
+            <th>Scale <i class="fa fa-battery"></i></th>
+            <th>Scale <i class="fa fa-broadcast-tower"></i></th>
+
 		</tr>
 	</thead>
 	<tbody>
@@ -59,8 +82,8 @@
 			<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>{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>
-			<td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>
+{{--			<td>{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>--}}
+{{--			<td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}
 			<td class="d-none">
 				<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>
 				{{$m && $m->value ? round($m->value, 2) : '-'}}

+ 1 - 1
resources/views/app/patients.blade.php

@@ -46,7 +46,7 @@
         </div>
 
         <div class="card-body p-0">
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-bordered p-0 m-0">
                 <thead class="bg-light">
                 <tr>
                     @if($pro->pro_type === 'ADMIN')