Fix anno corrente iscritti ai corsi

app/Http/Livewire/Course.php

@@ -136,7 +136,14 @@ class Course extends Component
         if (isset($_GET["year"]))
             $this->selectedYear = $_GET["year"];
         else
-            $this->selectedYear = $this->course_years[0];
+        {
+            if (date("m") >= env('FISCAL_YEAR_MONTH_FROM', 1))
+                $this->selectedYear = date("Y") . "-" . (date("Y") + 1);
+            else
+                $this->selectedYear = (date("Y") - 1) . "-" . date("Y");
+            //$this->selectedYear = $this->course_years[0];
+
+        }
             //$this->selectedYear = date("Y") . "-" . (date("Y") + 1);
         $this->records = \App\Models\Course::where('parent_id', null)->where('year', $this->selectedYear)->with('type', 'duration')->get();
         return view('livewire.course');

app/Http/Livewire/CourseMember.php

@@ -59,6 +59,11 @@ class CourseMember extends Component
         $this->course_years = \App\Models\Course::select('year')->where('year', '<>', '')->groupBy('year')->pluck('year');
         $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");
+
     }
 
     public function render()

resources/views/layouts/app.blade.php

@@ -315,7 +315,7 @@
                                     Corsi
                                 </button>
                             </h2>
-                            <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_list') || Request::is('course_member') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
+                            <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_list') || Request::is('course_member') || Request::is('calendar') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
                                 <div class="accordion-body">
                                     <ul class="nav nav-pills flex-column align-items-center align-items-sm-start w-100" id="menu-contabilita" style="margin-top:0px;">
                                         <li class="nav-item" style="{{Request::is('course_member') ? 'background-color: #c5d9e6;' : ''}}">

resources/views/livewire/course.blade.php

@@ -37,8 +37,17 @@
                             try
                             {
                                 list($f, $t) = explode("-", $c);
-                                if ($f == date("Y") - 1)
-                                    $selected = 'selected';
+                                if (date("m") >= env('FISCAL_YEAR_MONTH_FROM', 1))
+                                {
+                                    if ($f == date("Y"))
+                                        $selected = 'selected';
+                                }
+                                else
+                                {
+                                    if ($f == date("Y") - 1)
+                                        $selected = 'selected';
+                                }
+                                
                             } catch (Exception $e) {
 
                             }

resources/views/livewire/course_member.blade.php

@@ -415,6 +415,7 @@
 
 
         $('.filterYear').select2({ "language": { "noResults": function () { return "Nessun risultato"; } } });
+        $('.filterYear').val('{{$filterYear}}').trigger("change");
         $('.filterCards').select2({ "language": { "noResults": function () { return "Nessun risultato"; } } });