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

report presenze - fix filtri vuoti

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

+ 7 - 7
app/Http/Livewire/PresenceReport.php

@@ -128,7 +128,7 @@ class PresenceReport extends Component
 
 
             // Elenco corsi per tipologia in base al calendario
             // Elenco corsi per tipologia in base al calendario
             $courses = \App\Models\Course::where('name', $calendar->name)->where('date_from', '<=', $calendar->from)->where('date_to', '>=', $calendar->to);
             $courses = \App\Models\Course::where('name', $calendar->name)->where('date_from', '<=', $calendar->from)->where('date_to', '>=', $calendar->to);
-            if (!is_null($this->course_name)) {
+            if (!is_null($this->course_name) && $this->course_name != "") {
                 $courses = $courses->where('name', $this->course_name);
                 $courses = $courses->where('name', $this->course_name);
             }
             }
             $courses = $courses->pluck('id')->toArray();
             $courses = $courses->pluck('id')->toArray();
@@ -189,8 +189,8 @@ class PresenceReport extends Component
                 if ($show)
                 if ($show)
                 {
                 {
                     $course_level = "";
                     $course_level = "";
-                    if ($calendar->course && $calendar->course->level) {
-                        $course_level = trim($calendar->course->level->name);
+                    if ($member->course && $member->course->level) {
+                        $course_level = trim($member->course->level->name);
                     }
                     }
                     $this->records[$calendar->name][$h][] = array(
                     $this->records[$calendar->name][$h][] = array(
                         "course_level" => $course_level,
                         "course_level" => $course_level,
@@ -234,12 +234,12 @@ class PresenceReport extends Component
                 ];
                 ];
                 $instructor = implode(", ", array_filter($instructor));
                 $instructor = implode(", ", array_filter($instructor));
                 $motivation = $p->motivation ? $p->motivation->name : "";
                 $motivation = $p->motivation ? $p->motivation->name : "";
-                $status = "<span class='fw-bold' style='color:gray'>Recupero</span>";
-                // $status = "<span class='fw-bold' style='color:#0c6197'>Presente</span>";
+                // $status = "<span class='fw-bold' style='color:gray'>Recupero</span>";
+                $status = "<span class='fw-bold' style='color:#0c6197'>Presente</span>";
                 
                 
                 $course_level = "";
                 $course_level = "";
-                if ($calendar->course && $calendar->course->level) {
-                    $course_level = trim($calendar->course->level->name);
+                if ($member->course && $member->course->level) {
+                    $course_level = trim($member->course->level->name);
                 }
                 }
                 $this->records[$calendar->name][$h][] = array(
                 $this->records[$calendar->name][$h][] = array(
                     "course_level" => $course_level,
                     "course_level" => $course_level,