Просмотр исходного кода

controllo user collegato in report presenze

ferrari 3 месяцев назад
Родитель
Сommit
bda48bae2c
1 измененных файлов с 10 добавлено и 2 удалено
  1. 10 2
      app/Http/Livewire/PresenceReport.php

+ 10 - 2
app/Http/Livewire/PresenceReport.php

@@ -137,7 +137,11 @@ class PresenceReport extends Component
                 $presence = \App\Models\Presence::where('member_id', $member->member->id)->where('calendar_id', $calendar->id)->first();
                 if ($presence) {
                     $court = $presence->court ? $presence->court->name : "";
-                    $instructor = $presence->user->name . ($presence->instructor && $presence->instructor !== $presence->user ? ", " . $presence->instructor->name : "");
+                    $instructor = [
+                        $presence->user ? $presence->user->name : "",
+                        $presence->instuctor && $presence->instructor !== $presence->user ? $presence->instuctor->name : "",
+                    ];
+                    $instructor = implode(", ", array_filter($instructor));
                     $motivation = $presence->motivation ? $presence->motivation->name : "";
                 }
 
@@ -192,7 +196,11 @@ class PresenceReport extends Component
             $presences_recuperi = $presences_recuperi->get();
             foreach ($presences_recuperi as $p) {
                 $court = $p->court ? $p->court->name : "";
-                $instructor = $p->user->name . ($p->instructor && $p->instructor !== $p->user ? ", " . $p->instructor->name : "");
+                $instructor = [
+                    $p->user ? $p->user->name : "",
+                    $p->instuctor && $p->instructor !== $p->user ? $p->instuctor->name : "",
+                ];
+                $instructor = implode(", ", array_filter($instructor));
                 $motivation = $p->motivation ? $p->motivation->name : "";
                 $status = "<span class='fw-bold' style='color:gray'>Recupero</span>";
                 $this->records[$calendar->name][$h][] = array(