Fix corsi

app/Http/Livewire/CourseList.php

@@ -33,6 +33,7 @@ class CourseList extends Component
 
     public $courseId = 0;
 
+    public $filterYear = '';
     public $filterCourse = [];
     public $filterLevel = [];
     public $filterFrequency = [];
@@ -66,11 +67,20 @@ class CourseList extends Component
 
         $this->courses = \App\Models\Course::orderBy('name')->groupBy('name')->pluck('name');
 
+        if (date("m") >= env('FISCAL_YEAR_MONTH_FROM', 1))
+            $this->filterYear = date("Y") . "-" . (date("Y") + 1);
+        else
+            $this->filterYear = (date("Y") - 1) . "-" . date("Y");
+
         //if (sizeof($this->courses) > 0)
         //    $this->courseId = $this->courses[0]->id;
 
     }
 
+    public function updatedfilterYear($value){
+        $this->emit('load-data-table');
+    }
+
     public function updatedfilterCourse($value){
         $this->emit('load-data-table');
     }
@@ -117,6 +127,12 @@ class CourseList extends Component
             $member_course = $member_course->whereIn('member_id', $member_ids);
         }
 
+        if ($this->filterYear != "") 
+        {
+            $course_ids = \App\Models\Course::where('year', $this->filterYear)->pluck('id');
+            $member_course = $member_course->whereIn('course_id', $course_ids);
+        }
+
         if ($this->hasFilter)
         {
             if (isset($_GET["search"]["value"]))
@@ -139,6 +155,8 @@ class CourseList extends Component
                 }
             }
 
+            
+
             if (sizeof($this->filterCourse) > 0)
             {
                 $course_ids = [];

resources/views/livewire/course_list.blade.php

@@ -57,11 +57,11 @@
                         <b>Anno</b>
                     </div>
                     <div class="col-12">
-                        <select class="form-select filterYear" >
+                        <select class="form-select filterYear" wire:model="filterYear">
                             <option value="">--Seleziona--
                             @foreach($course_years as $c)
                                 @php
-                                $selected = '';
+                                /*$selected = '';
                                 try
                                 {
                                     list($f, $t) = explode("-", $c);
@@ -69,9 +69,9 @@
                                         $selected = 'selected';
                                 } catch (Exception $e) {
 
-                                }
+                                }*/
                                 @endphp
-                                <option value="{{$c}}" {{$selected}}>{{$c}}
+                                <option value="{{$c}}">{{$c}}
                             @endforeach
                         </select>
                     </div>
@@ -508,7 +508,15 @@
         } );
 
         $('.filterYear').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
-        $('.filterYear').val('{{date("Y")-1}}-{{date("Y")}}').trigger("change");
+        $('.filterYear').val('{{$filterYear}}').trigger("change");
+
+        $('.filterYear').on('change', function (e) {
+            var data = $('.filterYear').select2("val");
+            if (data == null) data = '';
+            @this.set('filterYear', data);
+            //@this.search();
+        });
+
         $('.filterCourse').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         $('.filterCourse').on('change', function (e) {
             var data = $('.filterCourse').select2("val");