Преглед изворни кода

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

Vijayakrishnan пре 4 година
родитељ
комит
6e2fe5e51d
2 измењених фајлова са 3 додато и 3 уклоњено
  1. 2 2
      app/Http/Controllers/HomeController.php
  2. 1 1
      resources/views/app/dashboard.blade.php

+ 2 - 2
app/Http/Controllers/HomeController.php

@@ -276,8 +276,8 @@ class HomeController extends Controller
             $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->friendlyStartTime = friendly_time($appointment->raw_start_time);
+            $appointment->friendlyEndTime = friendly_time($appointment->raw_end_time);
             $appointment->clientSummary = friendly_date_time($appointment->client->dob, false) . ' (' .
                 $appointment->client->age_in_years . ' y.o' .
                 ($appointment->client->sex ? ' ' . $appointment->client->sex : '') .

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

@@ -98,7 +98,7 @@
                         <div class="pb-1">
                             <b class="text-info">@{{ event.proName }}</b>
                             &nbsp;/&nbsp;
-                            @{{ event.friendlyStartTime }} - @{{ event.friendlyEndTime }}
+                            @{{ event.friendlyStartTime }} - @{{ event.friendlyEndTime }} <span class="text-secondary">@{{ event.timezone }}</span>
                             &nbsp;/&nbsp;
                             <span class="d-inline-block ml- 2 text-secondary font-weight-bold">@{{ event.title }}</span>
                         </div>