Show ALL appt.s in main dashboard if user is admin

app/Http/Controllers/HomeController.php

@@ -184,6 +184,7 @@ class HomeController extends Controller
         //patients where performer is the mcp
         $performer = $this->performer();
         $performerProID = $performer->pro->id;
+        $isAdmin = ($performer->pro->pro_type === 'ADMIN');
 
         $keyNumbers  = [];
 
@@ -197,7 +198,6 @@ class HomeController extends Controller
             })->count();
         $keyNumbers['patientsNotSeenYet'] = $patientNotSeenYet;
 
-
         $pendingBillsToSign = Bill::where(function ($query) use ($performerProID) {
             $query->where('hcp_pro_id', $performerProID)->where('is_signed_by_hcp', false)->where('is_cancelled', false);
         })
@@ -259,9 +259,14 @@ class HomeController extends Controller
         $totalExpectedAmount =  $expectedForHcp + $expectedForCm + $expectedForRme + $expectedForRmm + $expectedForNa;
         $reimbursement['nextPaymentAmount'] = '$' . $totalExpectedAmount;
 
-        $appointments = Appointment::where("pro_id", $performerProID)
-            ->orderBy('start_time', 'asc')
-            ->get();
+        if(!$isAdmin) {
+            $appointments = Appointment::where("pro_id", $performerProID)
+                ->orderBy('start_time', 'asc')
+                ->get();
+        }
+        else {
+            $appointments = Appointment::orderBy('start_time', 'asc')->get();
+        }
 
         foreach ($appointments as $appointment) {
             $date = explode(" ", $appointment->start_time)[0];
@@ -270,6 +275,7 @@ class HomeController extends Controller
             $appointment->dateYMD = date('Y-m-d', strtotime($appointment->start_time));
             $appointment->clientName = $appointment->client->displayName();
             $appointment->clientInitials = substr($appointment->client->name_first, 0, 1) . substr($appointment->client->name_last, 0, 1);
+            $appointment->proInitials = substr($appointment->pro->name_first, 0, 1) . substr($appointment->pro->name_last, 0, 1);
             $appointment->friendlyStartTime = friendly_time($appointment->start_time);
             $appointment->friendlyEndTime = friendly_time($appointment->end_time);
             $appointment->clientSummary = friendly_date_time($appointment->client->dob, false) . ' (' .
@@ -288,6 +294,7 @@ class HomeController extends Controller
             }
             $appointment->clientUid = $appointment->client->uid;
             $appointment->proUid = $appointment->pro->uid;
+            $appointment->proName = $appointment->pro->displayName();
         }
 
         $milliseconds = strtotime(date('Y-m-d')) . '000';

resources/views/app/dashboard.blade.php

@@ -93,17 +93,19 @@
                 </div>
                 <div v-for="event in events" class="align-items-end p-3 border rounded mb-3"
                      :class="event.dateYMD === selectedDate && (filterStatus === '' || filterStatus === event.status) ? 'd-flex' : 'd-none'">
-                    <div class="patient-avatar mr-3 align-self-center">@{{ event.clientInitials }}</div>
+                    <div class="patient-avatar mr-3 align-self-center">@{{ event.proInitials }}</div>
                     <div>
-                        <div class="font-weight-bold pb-1">
-                            @{{ event.clientName }}
-                            <span class="small d-inline-block pl-2 text-secondary font-weight-normal">@{{ event.clientSummary }}</span>
-                        </div>
                         <div class="pb-1">
+                            <b class="text-info">@{{ event.proName }}</b>
+                            &nbsp;/&nbsp;
                             @{{ event.friendlyStartTime }} - @{{ event.friendlyEndTime }}
                             &nbsp;/&nbsp;
                             <span class="d-inline-block ml- 2 text-secondary font-weight-bold">@{{ event.title }}</span>
                         </div>
+                        <div class="pb-1">
+                            <a target="_top" :href="'/mc/patients/view/' + event.clientUid" class="font-weight-bold">@{{ event.clientName }}</a>
+                            <span class="small d-inline-block pl-2 text-secondary font-weight-normal">@{{ event.clientSummary }}</span>
+                        </div>
                         <div>
                             Status: <b class="text-secondary">@{{ event.status }}</b>
                             &nbsp;/&nbsp;