updated

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

@@ -79,12 +79,21 @@
 			<td>{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : '-'}}</td>
 			<td>{{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}</td>
 
-            <td>BP</td>
-            <td><i class="fa fa-heartbeat"></i> </td>
-            <td>Pulse</td>
-            <td>BP/Pulse Timestamp</td>
-            <td>Weight</td>
-            <td>Weight Timestamp</td>
+            <td>
+                @if($patient->most_recent_cellular_bp_measurement_at)
+                    {{ $patient->most_recent_cellular_bp_sbp_mm_hg }} / {{ $patient->most_recent_cellular_bp_dbp_mm_hg }}
+                @endif
+            </td>
+
+            <td><?= $patient->most_recent_cellular_bp_value_irregular ? '<i class="fa fa-heartbeat"></i>' : '' ?></td>
+
+            <td>{{ $patient->most_recent_cellular_bp_value_pulse }}</td>
+
+            <td>{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at) }}</td>
+
+            <td>{{ $patient->most_recent_cellular_weight_value ? round($patient->most_recent_cellular_weight_value, 2) : '--' }}</td>
+
+            <td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at) }}</td>
 
 {{--			<td>{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>--}}
 {{--			<td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}
@@ -112,18 +121,3 @@
 <div class="p-3">
 	{{$patients->withQueryString()->links()}}
 </div>
-
-<td>
-    @if($patient->most_recent_cellular_bp_measurement_at)
-        {{ $patient->most_recent_cellular_bp_sbp_mm_hg }} / {{ $patient->most_recent_cellular_bp_dbp_mm_hg }}
-    @endif
-</td>
-<td><?= $patient->most_recent_cellular_bp_value_irregular ? '<i class="fa fa-heartbeat"></i>' : '' ?></td>
-<td>{{ $patient->most_recent_cellular_bp_value_pulse }}</td>
-<td>{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at) }}</td>
-<td>{{ $patient->most_recent_cellular_bp_battery_voltage }}</td>
-<td>{{ $patient->most_recent_cellular_bp_signal_strength }}</td>
-<td>{{ $patient->most_recent_cellular_weight_value ? round($patient->most_recent_cellular_weight_value, 2) : '--' }}</td>
-<td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at) }}</td>
-<td>{{ $patient->most_recent_cellular_weight_battery_voltage }}</td>
-<td>{{ $patient->most_recent_cellular_weight_signal_strengtd }}</td>

resources/views/app/practice-management/rpm-matrix.blade.php

@@ -57,7 +57,7 @@
                                 <td>{{ $client->most_recent_cellular_weight_value ? round($client->most_recent_cellular_weight_value, 2) : '--' }}</td>
                                 <td>{{ friendlier_date_time($client->most_recent_cellular_weight_measurement_at) }}</td>
                                 <td>{{ $client->most_recent_cellular_weight_battery_voltage }}</td>
-                                <td>{{ $client->most_recent_cellular_weight_signal_strengtd }}</td>
+                                <td>{{ $client->most_recent_cellular_weight_signal_strength }}</td>
                             </tr>
                         @endforeach
                     </tbody>