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

absence_report - fix presenze non segnate correttamente

ferrari пре 1 месец
родитељ
комит
79036e5405
1 измењених фајлова са 12 додато и 0 уклоњено
  1. 12 0
      app/Http/Livewire/AbsenceReport.php

+ 12 - 0
app/Http/Livewire/AbsenceReport.php

@@ -76,6 +76,18 @@ class AbsenceReport extends Component
 
                 $memberIds = $course_members->pluck('member_id')->unique()->values();
 
+                $presenceIndex = [];
+
+                $presenceRows = \App\Models\Presence::query()
+                    ->whereIn('calendar_id', $courseCalendars->pluck('id'))
+                    ->whereIn('member_id', $memberIds)
+                    ->where('status', '<>', 99)
+                    ->get(['member_id', 'calendar_id']);
+
+                foreach ($presenceRows as $p) {
+                    $presenceIndex[$p->member_id . '|' . $p->calendar_id] = true;
+                }
+
                 $makeups = \App\Models\Presence::query()
                     ->join('calendars', 'presences.calendar_id', '=', 'calendars.id')
                     ->where('presences.motivation_course_id', $course->id)