fix filtri tabelle - corretto salvataggio filtri applicati

resources/views/layouts/app.blade.php

@@ -279,7 +279,7 @@
                                                 </a>
                                             </li>
                                         @endif
-                                        <li class="nav-item {{Request::is('members_archive') ? "nav-item-active" : ""}}">
+                                        <li class="nav-item" style="{{Request::is('members_archive') ? 'background-color: #c5d9e6;' : ''}}">
                                             <a href="/members_archive" class="nav-link d-flex align-items-center linkMenu">
                                                 <span class="ms-3 d-md-inline">Archivio</span>
                                             </a>

resources/views/livewire/member_archive.blade.php

@@ -370,56 +370,56 @@
 
         function loadFilters() {
             let show = false;
-            var filterStatus = localStorage.getItem("filterStatusMember");
+            var filterStatus = localStorage.getItem("filterStatusMemberArchive");
             if (filterStatus != null && filterStatus != "null" && filterStatus != "undefined" && filterStatus)
             {
                 $('.filterStatus').val(filterStatus).trigger('change');
                 show = true;
             }
-            var filterCards = localStorage.getItem("filterCardsMember");
+            var filterCards = localStorage.getItem("filterCardsMemberArchive");
             if (filterCards != null && filterCards != "null" && filterCards != "undefined" && filterCards)
             {
                 $('.filterCards').val(filterCards).trigger('change');
                 show = true;
             }
-            var filterScadenza = localStorage.getItem("filterScadenzaMember");
+            var filterScadenza = localStorage.getItem("filterScadenzaMemberArchive");
             if (filterScadenza != null && filterScadenza != "null" && filterScadenza != "undefined" && filterScadenza)
             {
                 $('.filterScadenza').val(filterScadenza).trigger('change');
                 show = true;
             }
-            var filterCertificateType = localStorage.getItem("filterCertificateTypeMember");
+            var filterCertificateType = localStorage.getItem("filterCertificateTypeMemberArchive");
             if (filterCertificateType != null && filterCertificateType != "null" && filterCertificateType != "undefined" && filterCertificateType)
             {
                 $('.filterCertificateType').val(filterCertificateType).trigger('change');
                 show = true;
             }
-            var filterCategories = localStorage.getItem("filterCategoriesMember");
+            var filterCategories = localStorage.getItem("filterCategoriesMemberArchive");
             if (filterCategories != null && filterCategories != "null" && filterCategories != "undefined" && filterCategories)
             {
                 $('.filterCategories').val(filterCategories).trigger('change');
                 show = true;
             }
-            var fromYear = localStorage.getItem("fromYearMember");
+            var fromYear = localStorage.getItem("fromYearMemberArchive");
             if (fromYear != null && fromYear != "null" && fromYear != "undefined" && fromYear)
             {
                 $('input[name="txtFromYear"]').val(fromYear);
                 show = true;
             }
-            var toYear = localStorage.getItem("toYearMember");
+            var toYear = localStorage.getItem("toYearMemberArchive");
             if (toYear != null && toYear != "null" && toYear != "undefined" && toYear)
             {
                 $('input[name="txtToYear"]').val(toYear);
                 show = true;
             }
-            var fromYearYear = localStorage.getItem("fromYearYearMember");
+            var fromYearYear = localStorage.getItem("fromYearYearMemberArchive");
             if (fromYearYear != null && fromYearYear != "null" && fromYearYear != "undefined" && fromYearYear)
             {
                 $('input[name="txtFromYearYear"]').val(fromYearYear);
                 show = true;
             }
 
-            var toYearYear = localStorage.getItem("toYearYearMember");
+            var toYearYear = localStorage.getItem("toYearYearMemberArchive");
             if (toYearYear != null && toYearYear != "null" && toYearYear != "undefined" && toYearYear)
             {
                 $('input[name="txtToYearYear"]').val(toYearYear);
@@ -475,15 +475,15 @@
 
             const url = '/get_members?cards=' + $('.filterCards').val() + "&filterCategories=" + $('.filterCategories').val() + "&filterCertificateType=" + $('.filterCertificateType').val() + "&filterScadenza=" + $('.filterScadenza').val() + "&filterStatus=" + $('.filterStatus').val() + "&fromYear=" + $('input[name="txtFromYear"]').val() + "&toYear=" + $('input[name="txtToYear"]').val() + "&fromYearYear=" + $('input[name="txtFromYearYear"]').val() + "&toYearYear=" + $('input[name="txtToYearYear"]').val() + "&archived=1";
 
-            localStorage.setItem("filterCardsMember", $('.filterCards').val());
-            localStorage.setItem("filterCategoriesMember", $('.filterCategories').val());
-            localStorage.setItem("filterCertificateTypeMember", $('.filterCertificateType').val());
-            localStorage.setItem("filterScadenzaMember", $('.filterScadenza').val());
-            localStorage.setItem("filterStatusMember", $('.filterStatus').val());
-            localStorage.setItem("fromYearMember", $('input[name="txtFromYear"]').val());
-            localStorage.setItem("toYearMember", $('input[name="txtToYear"]').val());
-            localStorage.setItem("fromYearYearMember", $('input[name="txtFromYearYear"]').val());
-            localStorage.setItem("toYearYearMember", $('input[name="txtToYearYear"]').val());
+            localStorage.setItem("filterCardsMemberArchive", $('.filterCards').val());
+            localStorage.setItem("filterCategoriesMemberArchive", $('.filterCategories').val());
+            localStorage.setItem("filterCertificateTypeMemberArchive", $('.filterCertificateType').val());
+            localStorage.setItem("filterScadenzaMemberArchive", $('.filterScadenza').val());
+            localStorage.setItem("filterStatusMemberArchive", $('.filterStatus').val());
+            localStorage.setItem("fromYearMemberArchive", $('input[name="txtFromYear"]').val());
+            localStorage.setItem("toYearMemberArchive", $('input[name="txtToYear"]').val());
+            localStorage.setItem("fromYearYearMemberArchive", $('input[name="txtFromYearYear"]').val());
+            localStorage.setItem("toYearYearMemberArchive", $('input[name="txtToYearYear"]').val());
 
             if ($.fn.dataTable.isDataTable('#tablesaw-350')) {
                 $('#tablesaw-350').DataTable().destroy();

resources/views/livewire/receipt.blade.php

@@ -243,7 +243,8 @@
 @push('scripts')
     <script>
 
-$(document).ready(function () {
+        $(document).ready(function () {
+            loadFilters();
             loadDataTable();
         });
 
@@ -261,11 +262,15 @@ $(document).ready(function () {
             $('.filterMember').select2({ "language": { "noResults": function () { return "Nessun risultato"; } } });
             $('.filterSupplier').select2({ "language": { "noResults": function () { return "Nessun risultato"; } } });
 
+            loadFilters();
             loadDataTable();
         });
 
         Livewire.on('load-data-table', () => {
-            setTimeout(function() {loadDataTable()}, 100);
+            setTimeout(function() {
+                loadFilters();
+                loadDataTable();
+            }, 100);
         });
 
         Livewire.on('destroy-data-table', () => {
@@ -318,33 +323,35 @@ $(document).ready(function () {
             });
         }
 
-        
-        var filterStatus = localStorage.getItem("filterStatusReceipt");
-        if (filterStatus && filterStatus !== "null" && filterStatus !== "undefined") {
-            $('.filterStatus').val(filterStatus).trigger('change');
-        }
+        function loadFilters() {
+            var filterStatus = localStorage.getItem("filterStatusReceipt");
+            if (filterStatus && filterStatus !== "null" && filterStatus !== "undefined") {
+                $('.filterStatus').val(filterStatus).trigger('change');
+            }
 
-        var filterFrom = localStorage.getItem("filterFromReceipt");
-        if (filterFrom && filterFrom !== "null" && filterFrom !== "undefined") {
-            $('input[name="txtFrom"]').val(filterFrom);
-        }
+            var filterFrom = localStorage.getItem("filterFromReceipt");
+            if (filterFrom && filterFrom !== "null" && filterFrom !== "undefined") {
+                $('input[name="txtFrom"]').val(filterFrom);
+            }
 
-        var filterTo = localStorage.getItem("filterToReceipt");
-        if (filterTo && filterTo !== "null" && filterTo !== "undefined") {
-            $('input[name="txtTo"]').val(filterTo);
-        }
+            var filterTo = localStorage.getItem("filterToReceipt");
+            if (filterTo && filterTo !== "null" && filterTo !== "undefined") {
+                $('input[name="txtTo"]').val(filterTo);
+            }
 
-        var filterMember = localStorage.getItem("filterMemberReceipt");
-        if (filterMember && filterMember !== "null" && filterMember !== "undefined") {
-            $('.filterMember').val(filterMember).trigger('change');
-        }
+            var filterMember = localStorage.getItem("filterMemberReceipt");
+            if (filterMember && filterMember !== "null" && filterMember !== "undefined") {
+                $('.filterMember').val(filterMember).trigger('change');
+            }
 
-        var filterSupplier = localStorage.getItem("filterSupplierReceipt");
-        if (filterSupplier && filterSupplier !== "null" && filterSupplier !== "undefined") {
-            $('.filterSupplier').val(filterSupplier).trigger('change');
+            var filterSupplier = localStorage.getItem("filterSupplierReceipt");
+            if (filterSupplier && filterSupplier !== "null" && filterSupplier !== "undefined") {
+                $('.filterSupplier').val(filterSupplier).trigger('change');
+            }
         }
 
         isFilter = true;
+        loadFilters()
         loadDataTable();
 
         function reset()
@@ -357,6 +364,7 @@ $(document).ready(function () {
             $('.filterFrom').val('');
             $('.filterTo').val('');
             destroyDataTable();
+            loadFilters()
             loadDataTable();
         }
 
@@ -377,6 +385,7 @@ $(document).ready(function () {
 
             var filterMember = $('.filterMember').val();
             localStorage.setItem("filterMemberReceipt", filterMember);
+            console.log("filterMember", filterMember);
 
             var filterSupplier = $('.filterSupplier').val();
             localStorage.setItem("filterSupplierReceipt", filterSupplier);

resources/views/livewire/records_in.blade.php

@@ -1397,15 +1397,17 @@
             var filterFrom = $('.filterFrom').val();
             var filterTo = $('.filterTo').val();
 
-                // Salvo i filtri della ricerca
-            localStorage.setItem("filterCommercialRecordIn", filterCommercial);
-            localStorage.setItem("filterMemberRecordIn", filterMember);
-            localStorage.setItem("filterSupplierRecordIn", filterSupplier);
-            localStorage.setItem("filterPaymentMethodRecordIn", filterPaymentMethod);
-            localStorage.setItem("filterCausalsRecordIn", filterCausals);
-            localStorage.setItem("filterDestinationsRecordIn", filterDestinations);
-            localStorage.setItem("filterFromRecordIn", filterFrom);
-            localStorage.setItem("filterToRecordIn", filterTo);
+            // Salvo i filtri della ricerca
+            if(!@this.add && !@this.update) {
+                localStorage.setItem("filterCommercialRecordIn", filterCommercial);
+                localStorage.setItem("filterMemberRecordIn", filterMember);
+                localStorage.setItem("filterSupplierRecordIn", filterSupplier);
+                localStorage.setItem("filterPaymentMethodRecordIn", filterPaymentMethod);
+                localStorage.setItem("filterCausalsRecordIn", filterCausals);
+                localStorage.setItem("filterDestinationsRecordIn", filterDestinations);
+                localStorage.setItem("filterFromRecordIn", filterFrom);
+                localStorage.setItem("filterToRecordIn", filterTo);
+            }
 
             var totalString = "";
 

resources/views/livewire/records_out.blade.php

@@ -977,13 +977,15 @@
             var filterFrom = $('.filterFrom').val();
             var filterTo = $('.filterTo').val();
 
-            localStorage.setItem("filterMemberRecordOut", filterMember);
-            localStorage.setItem("filterSupplierRecordOut", filterSupplier);
-            localStorage.setItem("filterPaymentMethodRecordOut", filterPaymentMethod);
-            localStorage.setItem("filterCausalsRecordOut", filterCausals);
-            localStorage.setItem("filterOriginsRecordOut", filterOrigins);
-            localStorage.setItem("filterFromRecordOut", filterFrom);
-            localStorage.setItem("filterToRecordOut", filterTo);
+            if(!@this.add && !@this.update) {
+                localStorage.setItem("filterMemberRecordOut", filterMember);
+                localStorage.setItem("filterSupplierRecordOut", filterSupplier);
+                localStorage.setItem("filterPaymentMethodRecordOut", filterPaymentMethod);
+                localStorage.setItem("filterCausalsRecordOut", filterCausals);
+                localStorage.setItem("filterOriginsRecordOut", filterOrigins);
+                localStorage.setItem("filterFromRecordOut", filterFrom);
+                localStorage.setItem("filterToRecordOut", filterTo);
+            }
 
             $('#tablesaw-350').DataTable({
                 //searching: false,