|
|
@@ -40,8 +40,10 @@ class AbsenceReport extends Component
|
|
|
$courses = \App\Models\Course::where('name', $calendar->name)->where('date_from', '<=', $calendar->from)->where('date_to', '>=', $calendar->to);
|
|
|
$courses = $courses->pluck('id')->toArray();
|
|
|
|
|
|
+ $months = date("n", strtotime($calendar->from));
|
|
|
+
|
|
|
// Elenco utenti iscritti al corso "padre"
|
|
|
- $members = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->whereIn('course_id', $courses)->get();
|
|
|
+ $members = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->where('months', 'like', '%"m":' . $months . ',%')->whereIn('course_id', $courses)->get();
|
|
|
//$members = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->whereIn('member_id', $presences)->whereIn('course_id', $courses)->get();
|
|
|
foreach ($members as $member) {
|
|
|
|
|
|
@@ -65,7 +67,7 @@ class AbsenceReport extends Component
|
|
|
}
|
|
|
|
|
|
array_multisort(array_column($this->records, 'total'), SORT_DESC, $this->records);
|
|
|
-
|
|
|
+
|
|
|
return view('livewire.absence_report');
|
|
|
}
|
|
|
|