Fix

app/Http/Livewire/RecordIN.php

@@ -1192,4 +1192,10 @@ class RecordIN extends Component
         return $ret;
     }
 
+    public function setYear($idx, $xxx)
+    {
+        $m = $this->rows[$idx]["when"][$xxx]["month"]; 
+        $this->rows[$idx]["when"][$xxx]["year"] = $m < env('FISCAL_YEAR_MONTH_FROM', 1) ? (date("Y") + 1) : date("Y");        
+    }
+
 }

app/Models/Member.php

@@ -239,8 +239,9 @@ class Member extends Model
         $records = \App\Models\Money::where('member_id', $this->id)->get();
         foreach($records as $record)
         {
-            $ret += $record->amount;
+            $ret += floatval($record->amount);
         }
+        
         return $ret;
     }
 

resources/views/layouts/app.blade.php

@@ -375,11 +375,15 @@
         {
             $("#dateFrom").val(d);
             $("#dateTo").val(d);
+            $(".todayButton").removeClass("lightGrey");
+            $(".yesterdayButton").addClass("lightGrey");
         }
         function setYesterday(d)
         {
             $("#dateFrom").val(d);
             $("#dateTo").val(d);
+            $(".yesterdayButton").removeClass("lightGrey");
+            $(".todayButton").addClass("lightGrey");
         }
     </script>
 

resources/views/livewire/course_list.blade.php

@@ -415,7 +415,7 @@
                         data: 'column_2',
                         render: function (data, type, row){
                             const x = data.split("§");
-                            var ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + (x[0] == 1 ? 'green' : 'orange') + ' sub_' + row["column_16"] + '" onclick="setSubscription(' + row["column_15"] + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                            var ret = '<a style="width:100%;float:right; text-align:right; display:block; ' + (x[0] == 1 ? '' : 'cursor:pointer;') + '" class="' + (x[0] == 1 ? 'green' : 'orange') + ' sub_' + row["column_16"] + '" onclick="setSubscription(' + row["column_15"] + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             return ret;
                         }
                     },
@@ -426,7 +426,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -443,7 +443,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -460,7 +460,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -477,7 +477,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -494,7 +494,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -511,7 +511,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -528,7 +528,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -545,7 +545,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -562,7 +562,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -579,7 +579,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -596,7 +596,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -613,7 +613,7 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block; cursor:pointer;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
@@ -785,11 +785,13 @@
             {
                 $(".sub_" + selectedMemberCourseId).addClass("orange").removeClass("blue").removeClass("selected");
                 subscription = false;
+                $(".btNewPayment").hide();
             }
             else
             {
                 $(".sub_" + selectedMemberCourseId).addClass("blue").addClass("selected").removeClass("orange");
                 subscription = true;
+                $(".btNewPayment").show();
             }
         }
 

resources/views/livewire/member.blade.php

@@ -8,7 +8,7 @@
                 <div class="user--profile_card d-flex justify-content-between flex-column w-100 w-lg-auto mb-3 mb-lg-0">
                     <div class="user--details">
                         <header>
-                            <div class="avatar--wrapper d-flex align-items-center justify-content-between w-100">
+                            <div class="avatar--wrapper d-flex align-items-center justify-content-between w-50">
 
                                 <figure class="m-0 avatar--wrapper_img">
                                     @if ($currentMember->image != '')
@@ -352,7 +352,7 @@
                                 </div>
                                 <div class="col-12">
                                     <select name="filterScadenza" class="form-select filterScadenza" multiple="multiple">
-                                        <option value="">tutti
+                                        <option value="">Tutti
                                         <option value="1">Scaduti
                                         <option value="2">In scadenza
                                     </select>
@@ -366,7 +366,7 @@
                                 </div>
                                 <div class="col-12">
                                     <select name="filterCertificateType" class="form-select filterCertificateType" multiple="multiple">
-                                        <option value="">tutti
+                                        <option value="">Tutti
                                         <option value="N">Non agonistico
                                         <option value="A">Agonistico
                                     </select>
@@ -381,8 +381,8 @@
                                 <div class="col-12">
                                     <select name="filterCategories" class="form-select filterCategories" multiple="multiple">
                                         <option value="">Tutte
-                                        @foreach(getCategories() as $category)
-                                            <option value="{{$category->id}}">{{$category->name}}
+                                        @foreach($categories as $category)
+                                            <option value="{{$category["id"]}}">{{$category["name"]}}
                                         @endforeach
                                     </select>
                                 </div>
@@ -401,7 +401,7 @@
                 <section id="anagrafiche--utenti">
                     <div class="compare--chart_wrapper d-none"></div>
 
-                    <table class="table tablesaw tablesaw-stack table--lista_utenti" width="100%" id="tablesaw-350" width="100%">
+                    <table class="table tablesaw tablesaw-stack table--lista_utenti tableHead" width="100%" id="tablesaw-350" width="100%">
                         <thead>
                             <tr>
                                 <!--<th scope="col">#</th>-->
@@ -1175,8 +1175,10 @@
                                                                     @if(sizeof($suspendedMonths) > 0)
                                                                         <button class="btn--ui primary" style="color:white" wire:click="reactivate({{$member_course}})">Riattiva</button>&nbsp;
                                                                     @endif<br>
-                                                                    <br><b>Note</b><br>
-                                                                    {{$member_course->notes}}
+                                                                    @if($member_course->notes != '')
+                                                                        <br><b>Note</b><br>
+                                                                        {{$member_course->notes}}
+                                                                    @endif
                                                                 </td>
                                                             </tr>
                                                         @endif
@@ -1630,6 +1632,12 @@
 @push('scripts')
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <style>
+        table.tableHead thead {
+        /* Important */
+            position: sticky;
+            z-index: 100;
+            top: 0;
+        }
         .select2-container--default .select2-selection--single{
             background-color: #E9F0F5;
             border: 0.0625rem solid #DFE5EB;

resources/views/livewire/receipt.blade.php

@@ -35,10 +35,10 @@
                         <input id="dateTo" type="date" class="form-control filterTo" >
                     </div>
                     <div class="col-6 mt-2">
-                        <button class="btn--ui" onclick="setToday('{{date("Y-m-d")}}')">OGGI</button>
+                        <button class="btn--ui lightGrey todayButton" style="width:100%" onclick="setToday('{{date("Y-m-d")}}')">OGGI</button>
                     </div>
                     <div class="col-6 mt-2">
-                        <button class="btn--ui" onclick="setYesterday('{{date("Y-m-d",strtotime("-1 days"))}}')">IERI</button>
+                        <button class="btn--ui lightGrey yesterdayButton" style="width:100%" onclick="setYesterday('{{date("Y-m-d",strtotime("-1 days"))}}')">IERI</button>
                     </div>
                 </div>
             </div>
@@ -252,6 +252,8 @@
 
         function reset()
         {
+            $(".todayButton").addClass("lightGrey");
+            $(".yesterdayButton").addClass("lightGrey");
             $('.filterStatus').val(null).trigger("change");
             $('.filterFrom').val('');
             $('.filterTo').val('');

resources/views/livewire/records.blade.php

@@ -23,7 +23,7 @@
 
             <div class="row g-3">
                 <div class="col-md-2">
-                    Iscritto
+                    Utente
                     <select name="search_member_id" class="form-select filterMember" wire:model="filterMember">
                         <option value="">--Seleziona--
                         @foreach($members as $member)

resources/views/livewire/records_in.blade.php

@@ -48,16 +48,16 @@
                                     <b>Periodo</b>
                                 </div>
                                 <div class="col-12 mb-2">
-                                    <input id="dateFrom" type="date" class="form-control filterFrom" value="{{date("Y-m-d")}}" >
+                                    <input id="dateFrom" type="date" class="form-control filterFrom">
                                 </div>
                                 <div class="col-12">
-                                    <input id="dateTo" type="date" class="form-control filterTo"  value="{{date("Y-m-d")}}">
+                                    <input id="dateTo" type="date" class="form-control filterTo" >
                                 </div>
                                 <div class="col-6 mt-2">
-                                    <button class="btn--ui" onclick="setToday('{{date("Y-m-d")}}')">OGGI</button>
+                                    <button class="btn--ui lightGrey todayButton" style="width:100%" onclick="setToday('{{date("Y-m-d")}}')">OGGI</button>
                                 </div>
                                 <div class="col-6 mt-2">
-                                    <button class="btn--ui" onclick="setYesterday('{{date("Y-m-d",strtotime("-1 days"))}}')">IERI</button>
+                                    <button class="btn--ui lightGrey yesterdayButton" style="width:100%" onclick="setYesterday('{{date("Y-m-d",strtotime("-1 days"))}}')">IERI</button>
                                 </div>
                             </div>
                         </div>
@@ -131,7 +131,7 @@
                 <section id="resume-table">
                     <div class="compare--chart_wrapper d-none"></div>
 
-                    <table class="table tablesaw tablesaw-stack table--lista_entrate" id="tablesaw-350" width="100%">
+                    <table class="table tablesaw tablesaw-stack table--lista_entrate tableHead" id="tablesaw-350" width="100%">
                         <thead>
                             <tr>
                                 <!--<th scope="col"></th>-->
@@ -466,7 +466,7 @@
                                                             <div class="col-md-4">
                                                                 <span class="title-form d-block w-100">Mese</span>
                                                                 <div class="input-group mb-3">
-                                                                    <select class="form-select form-select-lg me-1"  wire:model="rows.{{$idx}}.when.{{$xxx}}.month" {{$this->dataId > 0 && !$isDuplicate ? 'disabled' : ''}}>
+                                                                    <select class="form-select form-select-lg me-1"  wire:model="rows.{{$idx}}.when.{{$xxx}}.month" onchange="setYear({{$idx}}, {{$xxx}})" {{$this->dataId > 0 && !$isDuplicate ? 'disabled' : ''}}>
                                                                         <option value="1">Gennaio</option>
                                                                         <option value="2">Febbraio</option>
                                                                         <option value="3">Marzo</option>
@@ -793,6 +793,12 @@
 @push('scripts')
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <style>
+        table.tableHead thead {
+        /* Important */
+            position: sticky;
+            z-index: 100;
+            top: 0;
+        }
         .select2-container--default .select2-selection--single{
             background-color: #E9F0F5;
             border: 0.0625rem solid #DFE5EB;
@@ -1077,6 +1083,8 @@
 
         function reset()
         {
+            $(".todayButton").addClass("lightGrey");
+            $(".yesterdayButton").addClass("lightGrey");
             $('.filterCommercial').val('').trigger('change');
             $('.filterMember').val('');
             $('.filterMember').trigger('change');
@@ -1285,6 +1293,11 @@
             window.location.href = "#top";
         });
 
+        function setYear(idx, xxx)
+        {
+            @this.setYear(idx, xxx);
+        }
+
 
     </script>
 

resources/views/livewire/records_out.blade.php

@@ -62,10 +62,10 @@
                                     <input id="dateTo" type="date" class="form-control filterTo" >
                                 </div>
                                 <div class="col-6 mt-2">
-                                    <button class="btn--ui" onclick="setToday('{{date("Y-m-d")}}')">OGGI</button>
+                                    <button class="btn--ui lightGrey todayButton" style="width:100%" onclick="setToday('{{date("Y-m-d")}}')">OGGI</button>
                                 </div>
                                 <div class="col-6 mt-2">
-                                    <button class="btn--ui" onclick="setYesterday('{{date("Y-m-d",strtotime("-1 days"))}}')">IERI</button>
+                                    <button class="btn--ui lightGrey yesterdayButton" style="width:100%" onclick="setYesterday('{{date("Y-m-d",strtotime("-1 days"))}}')">IERI</button>
                                 </div>
                             </div>
                         </div>
@@ -125,7 +125,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 tablesaw-stack tableHead" id="tablesaw-350" width="100%">
                         <thead>
                             <tr>
                                 <!--<th scope="col"></th>-->
@@ -506,6 +506,12 @@
 @push('scripts')
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <style>
+        table.tableHead thead {
+        /* Important */
+            position: sticky;
+            z-index: 100;
+            top: 0;
+        }
         .select2-container--default .select2-selection--single{
             background-color: #E9F0F5;
             border: 0.0625rem solid #DFE5EB;
@@ -722,6 +728,8 @@
 
         function reset()
         {
+            $(".todayButton").addClass("lightGrey");
+            $(".yesterdayButton").addClass("lightGrey");
             $('.filterSupplier').val('');
             $('.filterSupplier').trigger('change');
             $('.filterPaymentMethod').val('');

resources/views/livewire/reminders.blade.php

@@ -28,10 +28,10 @@
                         <input id="dateTo" type="date" class="form-control filterTo" >
                     </div>
                     <div class="col-6 mt-2">
-                        <button class="btn--ui" onclick="setToday('{{date("Y-m-d")}}')">OGGI</button>
+                        <button class="btn--ui lightGrey todayButton" style="width:100%" onclick="setToday('{{date("Y-m-d")}}')">OGGI</button>
                     </div>
                     <div class="col-6 mt-2">
-                        <button class="btn--ui" onclick="setYesterday('{{date("Y-m-d",strtotime("-1 days"))}}')">IERI</button>
+                        <button class="btn--ui lightGrey yesterdayButton" style="width:100%" onclick="setYesterday('{{date("Y-m-d",strtotime("-1 days"))}}')">IERI</button>
                     </div>
                 </div>
             </div>

routes/web.php

@@ -278,7 +278,7 @@ Route::get('/get_members', function(){
 
         if ($r->certificate_date != '')
         {
-            $y = $r->certificate . "|" . $r->certificate_date;
+            $y = $r->certificate . "|" . date("d/m/Y", strtotime($r->certificate_date));
         }
 
         /*
@@ -907,7 +907,7 @@ Route::get('/get_course_members', function(){
                 $ids[] = $a->id;
             }
         }
-        $datas = $datas->whereIn('id', $ids);
+        $datas = $datas->whereIn('member_courses.id', $ids);
     }
     if ($_GET["filterHours"] != "null")
     {
@@ -970,7 +970,8 @@ Route::get('/get_course_members', function(){
     }
     if ($_GET["filterCards"] != "null")
     {
-        $card_ids = \App\Models\MemberCard::whereIn('card_id', $_GET["filterCards"])->pluck('member_id');
+        $cards = explode(",", $_GET["filterCards"]);
+        $card_ids = \App\Models\MemberCard::whereIn('card_id', $cards)->pluck('member_id');
         $datas = $datas->whereIn('member_id', $card_ids);
     }
 
@@ -1035,7 +1036,7 @@ Route::get('/get_course_members', function(){
 
         $ret[] = array(
 
-            "column_0" => $idx,
+            "column_0" => $idx + 1,
             "column_1" => $r->last_name,
             "column_2" => $r->first_name,
             "column_3" => strval($interval->y),