fixed patients page

app/Models/Client.php

@@ -299,26 +299,12 @@ class Client extends Model
 
     public function nextMcpAppointment()
     {
-        if ($this->mcp) {
-            return Appointment::where('client_id', $this->id)
-                ->where('pro_id', $this->mcp->id)
-                ->where('start_time', '>=', date('Y-m-d'))
-                ->orderBy('start_time', 'asc')
-                ->first();
-        }
-        return false;
+        return $this->hasOne(Appointment::class, 'id', 'next_mcp_appointment_id');
     }
 
     public function lastMcpAppointment()
     {
-        if ($this->mcp) {
-            return Appointment::where('client_id', $this->id)
-                ->where('pro_id', $this->mcp->id)
-                ->where('start_time', '<', date('Y-m-d'))
-                ->orderBy('start_time', 'asc')
-                ->first();
-        }
-        return false;
+        return $this->hasOne(Appointment::class, 'id', 'previous_mcp_appointment_id');
     }
 
     public function lastMeasurementOfType($_type) {

app/Models/Pro.php

@@ -413,6 +413,7 @@ WHERE mcp_pro_id = :pro_id
 
     function get_patients_without_appointment_query() {
         return Client::where('mcp_pro_id', $this->id)
+                    ->whereNull('today_mcp_appointment_date')
                     ->where(function($q){
                         $q->whereNull('next_mcp_appointment_id')
                         ->orWhere('next_mcp_appointment_date', '<=', DB::raw('NOW()::DATE'));

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

@@ -46,9 +46,9 @@
 				{{$coverage->insuranceDisplayName()}}
 				@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->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>

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

@@ -47,9 +47,9 @@
 					@endif
 				</div>
 			</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->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 class="d-none">