Luca Parisio 1 år sedan
förälder
incheckning
bdbb0b0347
32 ändrade filer med 127 tillägg och 70 borttagningar
  1. 2 0
      app/Http/Livewire/CourseList.php
  2. 26 10
      app/Http/Livewire/Member.php
  3. 6 0
      public/css/extra.css
  4. 1 1
      resources/views/livewire/bank.blade.php
  5. 1 1
      resources/views/livewire/card.blade.php
  6. 1 1
      resources/views/livewire/category.blade.php
  7. 2 2
      resources/views/livewire/causal.blade.php
  8. 1 1
      resources/views/livewire/city.blade.php
  9. 2 2
      resources/views/livewire/course.blade.php
  10. 1 1
      resources/views/livewire/course_duration.blade.php
  11. 1 1
      resources/views/livewire/course_frequency.blade.php
  12. 1 1
      resources/views/livewire/course_level.blade.php
  13. 21 2
      resources/views/livewire/course_list.blade.php
  14. 1 1
      resources/views/livewire/course_member.blade.php
  15. 1 1
      resources/views/livewire/course_subscription.blade.php
  16. 1 1
      resources/views/livewire/course_type.blade.php
  17. 1 1
      resources/views/livewire/discipline.blade.php
  18. 36 28
      resources/views/livewire/member.blade.php
  19. 1 1
      resources/views/livewire/nation.blade.php
  20. 1 1
      resources/views/livewire/payment_method.blade.php
  21. 1 1
      resources/views/livewire/province.blade.php
  22. 1 1
      resources/views/livewire/receipt.blade.php
  23. 1 1
      resources/views/livewire/records.blade.php
  24. 1 1
      resources/views/livewire/records_in.blade.php
  25. 2 2
      resources/views/livewire/records_in_out.blade.php
  26. 1 1
      resources/views/livewire/records_out.blade.php
  27. 1 1
      resources/views/livewire/reminders.blade.php
  28. 2 2
      resources/views/livewire/sponsor.blade.php
  29. 1 1
      resources/views/livewire/supplier.blade.php
  30. 1 1
      resources/views/livewire/user.blade.php
  31. 1 1
      resources/views/livewire/vat.blade.php
  32. 6 0
      routes/web.php

+ 2 - 0
app/Http/Livewire/CourseList.php

@@ -24,6 +24,7 @@ class CourseList extends Component
     public $course_types = [];
     public $course_frequencies = [];
     public $course_levels = [];
+    public $course_years = [];
 
     public $totals = [];
     public $totalIsc = [];
@@ -42,6 +43,7 @@ class CourseList extends Component
         $this->course_durations = \App\Models\CourseDuration::select('*')->where('enabled', true)->get();
         $this->course_levels = \App\Models\CourseLevel::select('*')->where('enabled', true)->get();
         $this->course_frequencies = \App\Models\CourseFrequency::select('*')->where('enabled', true)->get();
+        $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');
 

+ 26 - 10
app/Http/Livewire/Member.php

@@ -272,7 +272,9 @@ class Member extends Component
         $levels_ids = [];
         if ($this->course_name != '')
         {
-            $all = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->where('enabled', true)->get();
+            list($n, $y) = explode("(", $this->course_name);
+            $y = trim(str_replace(")", "", $y));
+            $all = \App\Models\Course::where('name', 'like', '%' . trim($n) . "%")->where('year', $y)->where('enabled', true)->get();
             foreach($all as $a)
             {
                 $levels_ids[] = $a->course_level_id;
@@ -291,7 +293,9 @@ class Member extends Component
         $types_ids = [];
         if ($this->course_level_id != '')
         {
-            $all = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->where('enabled', true)->where('course_level_id', $this->course_level_id)->get();
+            list($n, $y) = explode("(", $this->course_name);
+            $y = trim(str_replace(")", "", $y));
+            $all = \App\Models\Course::where('name', 'like', '%' . trim($n) . "%")->where('year', $y)->where('enabled', true)->where('course_level_id', $this->course_level_id)->get();
             foreach($all as $a)
             {
                 $types_ids[] = $a->course_type_id;
@@ -308,7 +312,9 @@ class Member extends Component
         $frequencies_ids = [];
         if ($this->course_type_id != '')
         {
-            $all = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->where('enabled', true)->where('course_level_id', $this->course_level_id)->where('course_type_id', $this->course_type_id)->get();
+            list($n, $y) = explode("(", $this->course_name);
+            $y = trim(str_replace(")", "", $y));
+            $all = \App\Models\Course::where('name', 'like', '%' . trim($n) . "%")->where('year', $y)->where('enabled', true)->where('course_level_id', $this->course_level_id)->where('course_type_id', $this->course_type_id)->get();
             foreach($all as $a)
             {
                 $frequencies_ids[] = $a->course_frequency_id;
@@ -323,7 +329,9 @@ class Member extends Component
         $this->course_course_id = null;
         if ($this->course_frequency_id != '')
         {
-            $this->course_course_id = \App\Models\Course::where('name', 'like', '%' . $this->course_name . "%")->where('course_level_id', $this->course_level_id)->where('course_type_id', $this->course_type_id)->where('course_frequency_id', $this->course_frequency_id)->first()->id;
+            list($n, $y) = explode("(", $this->course_name);
+            $y = trim(str_replace(")", "", $y));
+            $this->course_course_id = \App\Models\Course::where('name', 'like', '%' . trim($n) . "%")->where('year', $y)->where('course_level_id', $this->course_level_id)->where('course_type_id', $this->course_type_id)->where('course_frequency_id', $this->course_frequency_id)->first()->id;
 
             if ($this->course_course_id > 0)
             {
@@ -586,7 +594,15 @@ class Member extends Component
     public function render()
     {
 
-        $this->course_names = \App\Models\Course::orderBy('name')->groupBy('name')->pluck('name');
+        $this->course_names = [];
+        $allC = \App\Models\Course::orderBy('name')->get();
+        foreach($allC as $c)
+        {
+            $cN = $c->name . " (" . $c->year . ")";
+            if (!in_array($cN, $this->course_names))
+                $this->course_names[] = $cN;
+        }
+        //$this->course_names = \App\Models\Course::orderBy('name')->groupBy('name')->pluck('name');
 
 
         $datas = [];
@@ -1394,7 +1410,7 @@ class Member extends Component
 
                 // Carico i dati relativi alla struttura ad albero
                 $c = \App\Models\Course::findOrFail($this->course_course_id);
-                $this->course_name = $c->name;
+                $this->course_name = $c->name . " (" . $c->year . ")";
                 $this->course_level_id = $c->course_level_id;
                 $this->course_type_id = $c->course_type_id;
                 $this->course_frequency_id = $c->course_frequency_id;
@@ -1965,15 +1981,15 @@ class Member extends Component
 
     }
 
-    public function updateBorsellino($member_id, $s)
+    public function updateBorsellino($importoBorsellino, $s)
     {
-        if ($this->importoBorsellino > 0)
+        if ($importoBorsellino > 0)
         {
-            $imp = $this->importoBorsellino;
+            $imp = $importoBorsellino;
             if ($s == "-")
                 $imp = $imp * -1;
             $money = new \App\Models\Money();
-            $money->member_id = $member_id;
+            $money->member_id = $this->currentMember->id;
             $money->record_id = null;
             $money->amount = $imp;
             $money->date = date("Y-m-d");

+ 6 - 0
public/css/extra.css

@@ -18,3 +18,9 @@
 {
     padding-left: 40px !important;
 }
+table.tableHead thead {
+/* Important */
+    position: sticky;
+    z-index: 100;
+    top: 0;
+}

+ 1 - 1
resources/views/livewire/bank.blade.php

@@ -42,7 +42,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 1 - 1
resources/views/livewire/card.blade.php

@@ -47,7 +47,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col" >Nome</th>

+ 1 - 1
resources/views/livewire/category.blade.php

@@ -26,7 +26,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 2 - 2
resources/views/livewire/causal.blade.php

@@ -26,7 +26,7 @@
 
             <h1>Entrata</h1>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col" width="50%">Nome</th>
@@ -59,7 +59,7 @@
             <br>
             <h1>Uscita</h1>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col" width="50%">Nome</th>

+ 1 - 1
resources/views/livewire/city.blade.php

@@ -23,7 +23,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Provincia</th>

+ 2 - 2
resources/views/livewire/course.blade.php

@@ -25,7 +25,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Anno</th>
@@ -323,7 +323,7 @@
             }
 
             $('#tablesaw-350').DataTable({
-                fixedHeader: true,
+                
                 thead: {
                 'th': {'background-color': 'blue'}
                 },

+ 1 - 1
resources/views/livewire/course_duration.blade.php

@@ -20,7 +20,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Durata</th>

+ 1 - 1
resources/views/livewire/course_frequency.blade.php

@@ -20,7 +20,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 1 - 1
resources/views/livewire/course_level.blade.php

@@ -20,7 +20,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 21 - 2
resources/views/livewire/course_list.blade.php

@@ -11,6 +11,21 @@
     <div class="showFilter" style="display:none"  wire:ignore.self>
         <hr size="1">
         <div class="row g-3">
+            <div class="col-md-2">
+                <div class="row">
+                    <div class="col-md-12" style="margin-bottom:10px;">
+                        <b>Anno</b>
+                    </div>
+                    <div class="col-12">
+                        <select class="form-select filterYear" >
+                            <option value="">--Seleziona--
+                            @foreach($course_years as $c)
+                                <option value="{{$c}}">{{$c}}
+                            @endforeach
+                        </select>
+                    </div>
+                </div>
+            </div>
             <div class="col-md-2">
                 <div class="row">
                     <div class="col-md-12" style="margin-bottom:10px;">
@@ -102,7 +117,7 @@
         <div class="compare--chart_wrapper d-none"></div>
 
 
-            <table class="table tablesaw tablesaw-stack pagamento--corsi display nowrap" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack pagamento--corsi display nowrap" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Cognome</th>
@@ -255,6 +270,7 @@
             loadDataTable();
         } );
 
+        $('.filterYear').select2();
         $('.filterCourse').select2();
         /*$('.filterCourse').on('change', function (e) {
             var data = $('.filterCourse').select2("val");
@@ -296,6 +312,7 @@
         });*/
 
         Livewire.on('load-data-table', () => {
+            $('.filterYear').select2();
             $('.filterCourse').select2();
             $('.filterLevel').select2();
             $('.filterFrequency').select2();
@@ -337,6 +354,7 @@
 
         function reset()
         {
+            $('.filterYear').val(null).trigger("change");
             $('.filterCourse').val(null).trigger("change");
             $('.filterLevel').val(null).trigger("change");
             $('.filterFrequency').val(null).trigger("change");
@@ -353,6 +371,7 @@
                 $('#tablesaw-350').DataTable().destroy();
             }
 
+            var filterYear = $('.filterYear').val();
             var filterCourse = $('.filterCourse').val();
             var filterLevel = $('.filterLevel').val();
             var filterDuration = $('.filterDuration').val();
@@ -363,7 +382,7 @@
                 //scrollX: true,
                 serverSide: true,
                 ajax: {
-                    url : '/get_course_list?filterCourse=' + filterCourse + '&filterDuration=' + filterDuration + '&filterLevel=' + filterLevel + '&filterType=' + filterType + '&filterFrequency=' + filterFrequency,
+                    url : '/get_course_list?filterCourse=' + filterCourse + '&filterDuration=' + filterDuration + '&filterLevel=' + filterLevel + '&filterType=' + filterType + '&filterFrequency=' + filterFrequency + '&filterYear=' + filterYear,
                     dataSrc: function (json){
                         if(json.totals){
                             totals = json.totals;

+ 1 - 1
resources/views/livewire/course_member.blade.php

@@ -258,7 +258,7 @@
 
         <div id="filter">{{$filter}}</div>
 
-        <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+        <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
             <thead>
                 <tr>
                     <th scope="col">#</th>

+ 1 - 1
resources/views/livewire/course_subscription.blade.php

@@ -20,7 +20,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 1 - 1
resources/views/livewire/course_type.blade.php

@@ -20,7 +20,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 1 - 1
resources/views/livewire/discipline.blade.php

@@ -20,7 +20,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 36 - 28
resources/views/livewire/member.blade.php

@@ -190,35 +190,13 @@
                 <button class="btn--ui lightGrey"  type="submit" wire:click.prevent="cancel()" style="margin-right:10px">annulla</button>
                 <!--<button class="btn--ui_outline btn-large" style="margin-right:10px"><i class="ico--ui utenti"></i>stampa profilo</button>-->
                 <div class="payment_btn">
-                    <a href="/in?new=1&memberId={{$currentMember->id}}" class="btn--ui primary">nuovo pagamento</a>
+                    <a href="/in?new=1&memberId={{$currentMember->id}}" class="btn--ui primary">NUOVA ENTRATA</a>
                     <!--<button class="btn--ui btn-large primary"><i class="ico--ui corsi"></i>pagamento corso</button>-->
                 </div>
             </div>
         </div>
 
-            <div  wire:ignore.self class="modal fade" id="userModal" tabindex="-1" aria-labelledby="userModalLabel" aria-hidden="true">
-                <div class="modal-dialog">
-                    <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="userModalLabel">Modifica borsellino</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="row">
-                            <div class="col-md-6">
-                                <label for="newMemberFirstName" class="form-label">Importo</label>
-                                <input class="form-control " type="text" id="importoBorsellino" wire:model="importoBorsellino">
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn--ui lightGrey" data-bs-dismiss="modal">Annulla</button>
-                        <button type="button" class="btn--ui btn-primary" wire:click.prevent="updateBorsellino({{$currentMember->id}}, '-')">Decrementa</button>
-                        <button type="button" class="btn--ui btn-primary" wire:click.prevent="updateBorsellino({{$currentMember->id}}, '+')">Aumenta</button>
-                    </div>
-                    </div>
-                </div>
-            </div>
+            
 
         @else
 
@@ -403,7 +381,7 @@
                 <section id="anagrafiche--utenti">
                     <div class="compare--chart_wrapper d-none"></div>
 
-                    <table class="table tablesaw tablesaw-stack table--lista_utenti tableHead" width="100%" id="tablesaw-350" width="100%">
+                    <table class="table tablesaw tableHead tablesaw-stack table--lista_utenti tableHead" width="100%" id="tablesaw-350" width="100%">
                         <thead>
                             <tr>
                                 <!--<th scope="col">#</th>-->
@@ -831,7 +809,7 @@
 
                                                     @if($dataId > -1)
                                                         @if(!$addCertificate && !$updateCertificate)
-                                                            <table class="table tablesaw tablesaw-stack" >
+                                                            <table class="table tablesaw tableHead tablesaw-stack" >
                                                                 <thead>
                                                                     <tr>
                                                                         <th scope="col">Tipo</th>
@@ -909,7 +887,7 @@
                                     @if($dataId > 0)
 
                                         @if(!$addCard && !$updateCard)
-                                            <table class="table tablesaw tablesaw-stack" id="tablesaw-350-1">
+                                            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350-1">
                                                 <thead>
                                                     <tr>
                                                         <th scope="col">Carta</th>
@@ -1101,7 +1079,7 @@
                                     @if($dataId > 0)
 
                                         @if(!$addCourse && !$updateCourse)
-                                            <table class="table tablesaw tablesaw-stack tabella--corsi" id="tablesaw-350-2" style="min-width:800px">
+                                            <table class="table tablesaw tableHead tablesaw-stack tabella--corsi" id="tablesaw-350-2" style="min-width:800px">
                                                 <tbody id="checkall-target">
                                                     @foreach($member_courses as $member_course)
                                                         <tr>
@@ -1630,6 +1608,30 @@
 
         @endif
 
+        <div  wire:ignore.self class="modal fade" id="userModal" tabindex="-1" aria-labelledby="userModalLabel" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="userModalLabel">Modifica borsellino</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <label for="newMemberFirstName" class="form-label">Importo</label>
+                            <input class="form-control " type="text" id="importoBorsellino" >
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn--ui lightGrey" data-bs-dismiss="modal">Annulla</button>
+                    <button type="button" class="btn--ui btn-primary" onclick="updateBorsellino('-')">Decrementa</button>
+                    <button type="button" class="btn--ui btn-primary" onclick="updateBorsellino('+')">Aumenta</button>
+                </div>
+                </div>
+            </div>
+        </div>
+
 @push('scripts')
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <style>
@@ -1917,6 +1919,12 @@
 
         });
 
+        function updateBorsellino(verse)
+        {
+            var importoBorsellino = $("#importoBorsellino").val();
+            @this.updateBorsellino(importoBorsellino, verse);
+        }
+
         Livewire.on('load-provinces', (nation_id, element) => {
             $('.' + element).select2({
                 ajax: {

+ 1 - 1
resources/views/livewire/nation.blade.php

@@ -45,7 +45,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Codice</th>

+ 1 - 1
resources/views/livewire/payment_method.blade.php

@@ -23,7 +23,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Banca</th>

+ 1 - 1
resources/views/livewire/province.blade.php

@@ -22,7 +22,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nazione</th>

+ 1 - 1
resources/views/livewire/receipt.blade.php

@@ -65,7 +65,7 @@
     <section id="resume-table">
         <div class="compare--chart_wrapper d-none"></div>
 
-        <table class="table tablesaw tablesaw-stack table--lista_ricevute" id="tablesaw-350" width="100%">
+        <table class="table tablesaw tableHead tablesaw-stack table--lista_ricevute" id="tablesaw-350" width="100%">
             <thead>
                 <tr>
                     <th scope="col">Anno</th>

+ 1 - 1
resources/views/livewire/records.blade.php

@@ -61,7 +61,7 @@
         <!--
         <canvas id="recordChart"></canvas>
             -->
-        <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+        <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
             <thead>
                 <tr>
                     <th scope="col">Data</th>

+ 1 - 1
resources/views/livewire/records_in.blade.php

@@ -126,7 +126,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack table--lista_entrate tableHead" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack table--lista_entrate tableHead" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <!--<th scope="col"></th>-->

+ 2 - 2
resources/views/livewire/records_in_out.blade.php

@@ -78,7 +78,7 @@
                         </div>
                     </div>
 
-                    <table class="table tablesaw tablesaw-stack collaptableIN" >
+                    <table class="table tablesaw tableHead tablesaw-stack collaptableIN" >
                         <thead>
                             <tr>
                                 <th scope="col" style="width:20%;text-align:left"></th>
@@ -193,7 +193,7 @@
                         </div>
                     </div>
 
-                    <table class="table tablesaw tablesaw-stack collaptableOUT">
+                    <table class="table tablesaw tableHead tablesaw-stack collaptableOUT">
                         <thead>
                             <tr>
                                 <th scope="col" style="width:20%;text-align:left"></th>

+ 1 - 1
resources/views/livewire/records_out.blade.php

@@ -121,7 +121,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack table--lista_entrate tableHead" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack table--lista_entrate tableHead" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <!--<th scope="col"></th>-->

+ 1 - 1
resources/views/livewire/reminders.blade.php

@@ -60,7 +60,7 @@
     <section id="resume-table">
         <div class="compare--chart_wrapper d-none"></div>
 
-        <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+        <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
             <thead>
                 <tr>
                     <th scope="col" >Tipologia</th>

+ 2 - 2
resources/views/livewire/sponsor.blade.php

@@ -38,7 +38,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Ragione sociale</th>
@@ -245,7 +245,7 @@
                                 <section id="resume-table">
                                     <div class="compare--chart_wrapper d-none"></div>
 
-                                    <table class="table tablesaw tablesaw-stack" id="tablesaw-350-1">
+                                    <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350-1">
                                         <thead>
                                             <tr>
                                                 <th scope="col">Data inizio</th>

+ 1 - 1
resources/views/livewire/supplier.blade.php

@@ -22,7 +22,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" width="100%" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" width="100%" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 1 - 1
resources/views/livewire/user.blade.php

@@ -18,7 +18,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 1 - 1
resources/views/livewire/vat.blade.php

@@ -21,7 +21,7 @@
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
-            <table class="table tablesaw tablesaw-stack" id="tablesaw-350" width="100%">
+            <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
                     <tr>
                         <th scope="col">Nome</th>

+ 6 - 0
routes/web.php

@@ -632,6 +632,12 @@ Route::group(['middleware' => 'auth'],function(){
             $member_course = $member_course->whereIn('course_id', $course_ids);
         }
 
+        if ($_GET["filterYear"] != "")
+        {
+            $course_ids = \App\Models\Course::where('year', $_GET["filterYear"])->pluck('id');
+            $member_course = $member_course->whereIn('course_id', $course_ids);
+        }
+
         if ($_GET["filterLevel"] != "null")
         {
             $levels = explode(",", $_GET["filterLevel"]);