Quellcode durchsuchen

absence_report - fix

ferrari vor 1 Monat
Ursprung
Commit
cf139cb9a8
1 geänderte Dateien mit 11 neuen und 1 gelöschten Zeilen
  1. 11 1
      app/Http/Livewire/AbsenceReport.php

+ 11 - 1
app/Http/Livewire/AbsenceReport.php

@@ -48,7 +48,17 @@ class AbsenceReport extends Component
             $limit = now()->endOfDay();
 
             foreach ($courses as $course) {
-                $course_members = \App\Models\MemberCourse::with('member')->where('course_id', $course->id)->where('is_archived', false)->where('is_deleted', false)->get();
+                $course_members = \App\Models\MemberCourse::join('members', 'member_id', 'members.id')
+                    ->where('course_id', $course->id)
+                    ->where(function($query) {
+                        $query->where('members.is_archived', false);
+                        $query->orWhereNull('members.is_archived');
+                    })
+                    ->where(function($query) {
+                        $query->where('members.is_deleted', false);
+                        $query->orWhereNull('members.is_deleted');
+                    })
+                    ->get();
 
                 $courseCalendars = \App\Models\Calendar::where('course_id', $course->id)->where('from', '<=', $limit)->get();