Fix corsi

app/Http/Livewire/AbsenceReport.php

@@ -43,7 +43,12 @@ class AbsenceReport extends Component
             $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 . '"%')->where('months', 'like', '%"m":' . $months . ',%')->whereIn('course_id', $courses)->get();
+            $members = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")
+                ->where('when', 'like', '%"from":"' . $h . '"%')
+                ->whereNot('months', 'like', '%"m":' . $months . ',"status":2%')
+                ->whereDate('date_from', '<=', $calendar->from)                                 
+                ->whereDate('date_to', '>=', $calendar->from)      
+                ->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) {
 

app/Http/Livewire/Member.php

@@ -808,7 +808,7 @@ class Member extends Component
             $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 . '"%')->where('months', 'like', '%"m":' . $months . ',%')->whereIn('course_id', $courses)->where('member_id', $this->dataId)->first())
+            if (\App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->whereNot('months', 'like', '%"m":' . $months . ',"status":2%')->whereDate('date_from', '<=', $calendar->from)->whereDate('date_to', '>=', $calendar->from)->where('months', 'like', '%"m":' . $months . ',%')->whereIn('course_id', $courses)->where('member_id', $this->dataId)->first())
             {
                 $status = '';
                 if (in_array($calendar->id, $presences))

app/Http/Livewire/Presence.php

@@ -85,7 +85,13 @@ class Presence extends Component
             $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 . '"%')->where('months', 'like', '%"m":' . $months . ',%')->whereIn('course_id', $courses)->pluck('member_id')->toArray();
+            $members_courses = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")
+                ->where('when', 'like', '%"from":"' . $h . '"%')
+                ->whereNot('months', 'like', '%"m":' . $months . ',"status":2%')
+                ->whereDate('date_from', '<=', $this->calendar->from)                                 
+                ->whereDate('date_to', '>=', $this->calendar->from)      
+                ->whereIn('course_id', $courses)
+                ->pluck('member_id')->toArray();
 
             if ($this->filter != '') {
                 $filter = $this->filter;

app/Http/Livewire/PresenceReport.php

@@ -93,7 +93,12 @@ class PresenceReport extends Component
             $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 . '"%')->where('months', 'like', '%"m":' . $months . ',%')->whereIn('course_id', $courses)->get();
+            $members = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")
+                ->where('when', 'like', '%"from":"' . $h . '"%')
+                ->whereDate('date_from', '<=', $calendar->from)                                 
+                ->whereDate('date_to', '>=', $calendar->from)      
+                ->whereNot('months', 'like', '%"m":' . $months . ',"status":2%')
+                ->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) {
 

resources/views/livewire/member.blade.php

@@ -1449,18 +1449,16 @@
                                                             <input class="form-control" type="text" id="course_subscription_price" placeholder="Costo iscrizione" wire:model="course_subscription_price" onkeyup="onlyNumberAmount(this)">
                                                         </div>
                                                     </div>
-                                                    @if(false)
-                                                        <div class="row mt-4">
-                                                            <div class="col-md-6">
-                                                                <label for="course_date_from" class="form-label">Dal</label>
-                                                                <input class="form-control" type="date" id="course_date_from" placeholder="Dal" wire:model="course_date_from">
-                                                            </div>
-                                                            <div class="col-md-6">
-                                                                <label for="course_date_to" class="form-label">Al</label>
-                                                                <input class="form-control" type="date" id="course_date_to" placeholder="Al" wire:model="course_date_to">
-                                                            </div>
+                                                    <div class="row mt-4">
+                                                        <div class="col-md-6">
+                                                            <label for="course_date_from" class="form-label">Dal</label>
+                                                            <input class="form-control" type="date" id="course_date_from" placeholder="Dal" wire:model="course_date_from">
                                                         </div>
-                                                    @endif
+                                                        <div class="col-md-6">
+                                                            <label for="course_date_to" class="form-label">Al</label>
+                                                            <input class="form-control" type="date" id="course_date_to" placeholder="Al" wire:model="course_date_to">
+                                                        </div>
+                                                    </div>
                                                     @foreach($course_when as $idW => $when)
                                                         <div class="row">
                                                             <div class="col-12">