Luca Parisio 3 месяцев назад
Родитель
Сommit
ef2d0eee7e

+ 4 - 2
app/Http/Livewire/AbsenceReport.php

@@ -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');
     }
 

+ 3 - 1
app/Http/Livewire/Member.php

@@ -805,8 +805,10 @@ class Member extends Component
             // 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)->pluck('id')->toArray();
 
+            $months = date("n", strtotime($calendar->from));
+
             // Elenco utenti iscritti al corso "padre"
-            if (\App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->whereIn('course_id', $courses)->where('member_id', $this->dataId)->first())
+            if (\App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->where('months', 'like', '%"m":' . $months . ',%')->whereIn('course_id', $courses)->where('member_id', $this->dataId)->first())
             {
                 $status = '';
                 if (in_array($calendar->id, $presences))

+ 2 - 1
app/Http/Livewire/Presence.php

@@ -82,9 +82,10 @@ class Presence extends Component
             // Elenco corsi per tipologia in base al calendario
             $courses = \App\Models\Course::where('name', $this->calendar->name)->where('date_from', '<=', $this->calendar->from)->where('date_to', '>=', $this->calendar->to)->pluck('id')->toArray();
 
+            $months = date("n", strtotime($this->calendar->from));
 
             // Elenco utenti iscritti al corso "padre"
-            $members_courses = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->whereIn('course_id', $courses)->pluck('member_id')->toArray();
+            $members_courses = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->where('months', 'like', '%"m":' . $months . ',%')->whereIn('course_id', $courses)->pluck('member_id')->toArray();
 
             if ($this->filter != '') {
                 $filter = $this->filter;

+ 3 - 1
app/Http/Livewire/PresenceReport.php

@@ -90,8 +90,10 @@ class PresenceReport extends Component
 
             $mids = [];
 
+            $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) {