Luca Parisio 1 ano atrás
pai
commit
43749409f2

+ 1 - 1
resources/views/layouts/app.blade.php

@@ -142,7 +142,7 @@
             </a>
         </div>
         <div class="header--gestionale_pageTitle d-flex align-items-center justify-content-between">
-            <h3 style="color:white;text-transform:uppercase;">
+            <h3 style="color:white;text-transform:uppercase;font-size:30px;">
             @php
             if (Request::is('dashboard'))
                 print "Dashboard";

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

@@ -22,7 +22,7 @@
 
         <a class="btn--ui lightGrey" href="/settings?type=corsi"><i class="fa-solid fa-arrow-left"></i></a><br>
 
-        <div class="row mb-3">
+        <div class="row mb-3 mt-3">
             <div class="col-1 mt-2">
                 <h4>Anno</h4>
             </div>
@@ -428,8 +428,10 @@
                     "url": "/assets/js/Italian.json"
                 },
                 "fnInitComplete": function (oSettings, json) {
-                    var html = '&nbsp;<a href="#" class="addData btn--ui"><i class="fa-solid fa-plus"></i></a>&nbsp;<a href="#" class="duplicateData btn--ui"><i class="fa-solid fa-copy"></i></a>';
+                    var html = '&nbsp;<a href="#" class="addData btn--ui"><i class="fa-solid fa-plus"></i></a>';
                     $(".dt-search").append(html);
+                    html = '&nbsp;<a href="#" class="duplicateData btn--ui" style="display:none"><i class="fa-solid fa-copy fa-lg" style="height:5px;"></i></a>';
+                    $(".dt-buttons").after(html);
                 }
             });
             $('#tablesaw-350 thead tr th').addClass('col');
@@ -443,6 +445,10 @@
                 }else{
                     courses.splice(courses.indexOf(id), 1);  //deleting
                 }
+                if (courses.length > 0)
+                    $(".duplicateData").show();
+                else
+                    $(".duplicateData").hide();
                 console.log(courses);
             });
 
@@ -464,6 +470,10 @@
                     if (all)
                         courses.push($(this).attr('name'));
                 });
+                if (courses.length > 0)
+                    $(".duplicateData").show();
+                else
+                    $(".duplicateData").hide();
                 console.log(courses);
             });
 

+ 27 - 19
resources/views/livewire/course_list.blade.php

@@ -132,6 +132,7 @@
                 <thead>
                     <tr>
                         <th scope="col"></th>
+                        <th scope="col">Corso</th>
                         <th scope="col">Cognome</th>
                         <th scope="col">Nome</th>
                         <th scope="col">Iscrizione</th>
@@ -300,8 +301,8 @@
             loadDataTable();
         } );
 
-        $('.filterYear').select2();
-        $('.filterCourse').select2();
+        $('.filterYear').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+        $('.filterCourse').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         /*$('.filterCourse').on('change', function (e) {
             var data = $('.filterCourse').select2("val");
             if (data == null) data = [];
@@ -309,7 +310,7 @@
             //@this.search();
         });*/
 
-        $('.filterLevel').select2();
+        $('.filterLevel').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         /*$('.filterLevel').on('change', function (e) {
             var data = $('.filterLevel').select2("val");
             if (data == null) data = [];
@@ -317,7 +318,7 @@
             //@this.search();
         });*/
 
-        $('.filterFrequency').select2();
+        $('.filterFrequency').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         /*$('.filterFrequency').on('change', function (e) {
             var data = $('.filterFrequency').select2("val");
             if (data == null) data = [];
@@ -325,7 +326,7 @@
             //@this.search();
         });*/
 
-        $('.filterType').select2();
+        $('.filterType').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         /*$('.filterType').on('change', function (e) {
             var data = $('.filterType').select2("val");
             if (data == null) data = [];
@@ -333,7 +334,7 @@
             //@this.search();
         });*/
 
-        $('.filterDuration').select2();
+        $('.filterDuration').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         /*$('.filterDuration').on('change', function (e) {
             var data = $('.filterDuration').select2("val");
             if (data == null) data = [];
@@ -342,12 +343,12 @@
         });*/
 
         Livewire.on('load-data-table', () => {
-            $('.filterYear').select2();
-            $('.filterCourse').select2();
-            $('.filterLevel').select2();
-            $('.filterFrequency').select2();
-            $('.filterType').select2();
-            $('.filterDuration').select2();
+            $('.filterYear').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterCourse').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterLevel').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterFrequency').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterType').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterDuration').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             loadDataTable();
         });
 
@@ -478,6 +479,9 @@
                             return data;
                         }
                     },
+                    {
+                        data: 'column_19'
+                    },
                     {
                         data: 'column_0',
                         render: function (data, type, row){
@@ -724,18 +728,20 @@
                                 text: 'Esporta',
                                 buttons: [
                                     {
-                                    extend: 'excelHtml5',"action":newexportaction,
+                                        extend: 'excelHtml5',"action":newexportaction,
                                         title: 'Pagamento corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
-                                        }
+                                        },
+                                        footer: false
                                     },
                                     {
                                         extend: 'pdfHtml5',"action":newexportaction,
                                         title: 'Pagamento corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
-                                        }
+                                        },
+                                        footer: false
                                     },
                                     {
                                         extend: 'print',"action":newexportaction,
@@ -743,7 +749,8 @@
                                         title: 'Pagamento corsi',
                                         exportOptions: {
                                             columns: ":not(':last')"
-                                        }
+                                        },
+                                        footer: false
                                     }
                                 ],
                                 dropup: true
@@ -757,7 +764,7 @@
                     },
                     top1C :'search',
                 },
-                order: [[1, 'asc'], [2, 'asc']],
+                order: [[2, 'asc'], [3, 'asc']],
                 pagingType: 'numbers',
                 "language": {
                     "url": "/assets/js/Italian.json"
@@ -770,10 +777,11 @@
                     let api = this.api();
 
                     api.column(0).footer().innerHTML = '';
-                    api.column(3).footer().innerHTML = '';
+                    api.column(1).footer().innerHTML = '';
                     api.column(2).footer().innerHTML = '';
+                    api.column(3).footer().innerHTML = '';
 
-                    for(var i=3; i<=14; i++)
+                    for(var i=4; i<=14; i++)
                     {
                         api.column(i).footer().innerHTML = '';
                     }

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

@@ -373,30 +373,30 @@
             loadDataTable();
         } );
 
-        $('.filterCourse').select2();
+        $('.filterCourse').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
-        $('.filterLevel').select2();
+        $('.filterLevel').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
-        $('.filterFrequency').select2();
+        $('.filterFrequency').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
-        $('.filterType').select2();
+        $('.filterType').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
-        $('.filterDuration').select2();
+        $('.filterDuration').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
-        $('.filterDays').select2();
+        $('.filterDays').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
-        $('.filterHours').select2();
+        $('.filterHours').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
-        $('.filterStatus').select2();
+        $('.filterStatus').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
-        $('.filterSubscription').select2();
+        $('.filterSubscription').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
-        $('.filterCertificateScadenza').select2();
-        $('.filterCertificateType').select2();
+        $('.filterCertificateScadenza').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+        $('.filterCertificateType').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
 
-        $('.filterYear').select2();
-        $('.filterCards').select2();
+        $('.filterYear').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+        $('.filterCards').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
 
 
@@ -405,19 +405,19 @@
         });*/
 
         Livewire.on('load-data-table', () => {
-            $('.filterCourse').select2();
-            $('.filterLevel').select2();
-            $('.filterFrequency').select2();
-            $('.filterType').select2();
-            $('.filterDuration').select2();
-            $('.filterDays').select2();
-            $('.filterHours').select2();
-            $('.filterStatus').select2();
-            $('.filterSubscription').select2();
-            $('.filterYear').select2();
-            $('.filterCards').select2();
-            $('.filterCertificateScadenza').select2();
-            $('.filterCertificateType').select2();
+            $('.filterCourse').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterLevel').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterFrequency').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterType').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterDuration').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterDays').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterHours').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterStatus').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterSubscription').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterYear').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterCards').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterCertificateScadenza').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterCertificateType').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             loadDataTable();
         });
 

+ 19 - 14
resources/views/livewire/member.blade.php

@@ -131,12 +131,14 @@
 
                     <div class="resume--tab_info gruppi">
                         <h2 class="mb-3">Gruppi di appartenenza</h2>
-                        <div class="resume--info d-flex align-items-start">
+                        <div class="resume--info d-flex align-items-start row">
 
                             @foreach($currentMember->categories as $member_category)
-                                <i class="ico--ui gruppi me-2"></i>
-                                <div class="title" style="margin-right:20px">
-                                    <h4>{{$member_category->category->getTree()}}</h4>
+                                <div class="col-md-3 mb-3">
+                                    <i class="ico--ui gruppi me-2"></i>
+                                    <div class="title" style="margin-right:20px">
+                                        <h4>{{$member_category->category->getTree()}}</h4>
+                                    </div>
                                 </div>
                             @endforeach
 
@@ -538,9 +540,12 @@
                                                         </select>
                                                     </div>
                                                     <div class="col-md-6 col-xxl-3">
-                                                        <label for="inputDate" class="form-label">Data di nascita {!!$age != '' ? ' <b>(' . $age . ')</b>' : ''!!}{!!$under18 ? '<span style="color:red;font-weight:bold">&nbsp;MINORENNE</span>' : ''!!}</label>
+                                                        <label for="inputDate" class="form-label">Data di nascita {!!$age != '' ? ' <b style="font-size:14px;">(' . $age . ')</b>' : ''!!}</label>
                                                         <div class="input-group mb-3">
-                                                            <input class="form-control @error('birth_date') is-invalid @enderror" type="date" id="birth_date" placeholder="Data di nascita" wire:model="birth_date">
+                                                            <div style="width:100%">
+                                                                <input class="form-control @error('birth_date') is-invalid @enderror" type="date" id="birth_date" placeholder="Data di nascita" wire:model="birth_date">
+                                                            </div>
+                                                            <div style="width:100%; text-align:center;">{!!$under18 ? '<span style="color:red;font-weight:bold;font-size:12px;">&nbsp;MINORENNE</span>' : ''!!}</div>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -1893,7 +1898,7 @@
                 dataType: 'json'
             }
         });
-        $('.cityClass').select2();*/
+        $('.cityClass').select2({"language": {"noResults": function(){return "Nessun risultato";}}});*/
 
         var nation_birth_id = 0;
         var province_birth_id = 0;
@@ -1915,8 +1920,8 @@
             @this.checkIsBirthItaly();
         });
 
-        $('.provinceBirthClass').select2();
-        $('.cityBirthClass').select2();*/
+        $('.provinceBirthClass').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+        $('.cityBirthClass').select2({"language": {"noResults": function(){return "Nessun risultato";}}});*/
 
         Livewire.on('load-select', () => {
 
@@ -2160,11 +2165,11 @@
             $('#tablesaw-350').DataTable().destroy();
         }
 
-        $('.filterCards').select2();
-        $('.filterStatus').select2();
-        $('.filterScadenza').select2();
-        $('.filterCertificateType').select2();
-        $('.filterCategories').select2();
+        $('.filterCards').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+        $('.filterStatus').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+        $('.filterScadenza').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+        $('.filterCertificateType').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+        $('.filterCategories').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
         @if(isset($_GET["showFilters"]))
             var filterStatus = localStorage.getItem("filterStatusMember");

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

@@ -203,10 +203,10 @@
             loadDataTable();
         } );
 
-        $('.filterStatus').select2();
+        $('.filterStatus').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
         Livewire.on('load-data-table', () => {
-            $('.filterStatus').select2();
+            $('.filterStatus').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             loadDataTable();
         });
 

+ 31 - 5
resources/views/livewire/records.blade.php

@@ -56,7 +56,7 @@
 
     </section>
 
-    <section id="resume-table">
+    <section id="resume-table"  class="scrollTable">
 
         <!--
         <canvas id="recordChart"></canvas>
@@ -203,6 +203,18 @@
 @push('scripts')
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <style>
+
+        .scrollTable {
+            margin-left: 0px ;
+            margin-right: 0px ;
+            padding: 15px;
+            /*max-width: 800px !important;*/
+            overflow-x: auto;
+            overflow-y: hidden;
+            white-space: nowrap;
+            border: 1px solid #ddd;
+        }
+
         table thead {
         /* Important */
             position: sticky;
@@ -290,7 +302,7 @@
                     }, 100);
                 });
 
-                $('.filterCausals').select2();
+                $('.filterCausals').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
                 $('.filterCausals').on('change', function (e) {
                     var data = $('.filterCausals').select2("val");
                     @this.set('filterCausals', data);
@@ -306,7 +318,7 @@
                     }, 100);
                 });
 
-                $('.filterMember').select2();
+                $('.filterMember').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
                 $('.filterMember').on('change', function (e) {
                     var data = $('.filterMember').select2("val");
                     @this.set('filterMember', data);
@@ -316,16 +328,17 @@
         }
 
         Livewire.on('load-select', () => {
-            $('.filterCausals').select2();
+            $('.filterCausals').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.filterCausals').on('change', function (e) {
                 var data = $('.filterCausals').select2("val");
                 @this.set('filterCausals', data);
             });
-            $('.filterMember').select2();
+            $('.filterMember').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.filterMember').on('change', function (e) {
                 var data = $('.filterMember').select2("val");
                 @this.set('filterMember', data);
             });
+            setMaxWidth();
         });
 
         load();
@@ -360,6 +373,19 @@
         document.querySelector("#print").addEventListener("click", function(){
         printData();
         });
+
+        $( document ).ready( function(){
+
+            setMaxWidth();
+            $( window ).bind( "resize", setMaxWidth ); //Remove this if it's not needed. It will react when window changes size.
+
+            
+
+        });
+
+        function setMaxWidth() {
+                $("#resume-table").width( Math.round( $(window ).width() - 350 ) ) ;
+            }
         /*
         const chart = new Chart(
             document.getElementById('recordChart'), {

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

@@ -827,7 +827,7 @@
         }
         @if($refreshAfter == 1)
             setTimeout(() => {
-                // $('.causalClass').select2();
+                // $('.causalClass').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
                 $('.causalClass').select2({
                     matcher: function(params, data) {
                         return matchStart(params, data);
@@ -849,7 +849,7 @@
             }, 1000);
         @endif
         window.livewire.on('refresh', () => {
-            // $('.causalClass').select2();
+            // $('.causalClass').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.memberClass').select2({
                 tags: false
             });
@@ -892,20 +892,20 @@
                 var data = $('.paymentClass').select2("val");
                 @this.set('payment_method_id', data);
             });
-            $('.filterCommercial').select2();
-            $('.filterMember').select2();
+            $('.filterCommercial').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+            $('.filterMember').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             /*$('.filterMember').on('change', function (e) {
                 var data = $('.filterMember').select2("val");
                 @this.set('filterMember', data);
                 @this.search();
             });*/
 
-            $('.filterPaymentMethod').select2();
+            $('.filterPaymentMethod').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.filterPaymentMethod').on('change', function (e) {
                 //var data = $('.filterPaymentMethod').select2("val");
                 //@this.set('filterPaymentMethod', data);
             });
-            $('.filterCausals').select2();
+            $('.filterCausals').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.filterCausals').on('change', function (e) {
                 //var data = $('.filterCausals').select2("val");
                 //@this.set('filterCausals', data);
@@ -919,12 +919,12 @@
             //pcsh2();
         });
 
-        $('.filterPaymentMethod').select2();
+        $('.filterPaymentMethod').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         $('.filterPaymentMethod').on('change', function (e) {
             //var data = $('.filterPaymentMethod').select2("val");
             //@this.set('filterPaymentMethod', data);
         });
-        $('.filterCausals').select2();
+        $('.filterCausals').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         $('.filterCausals').on('change', function (e) {
             //var data = $('.filterCausals').select2("val");
             //@this.set('filterCausals', data);
@@ -940,14 +940,14 @@
             });
         });
 
-        $('.filterCommercial').select2();
-        $('.filterMember').select2();
+        $('.filterCommercial').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
+        $('.filterMember').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         /*$('.filterMember').on('change', function (e) {
             var data = $('.filterMember').select2("val");
             @this.set('filterMember', data);
             @this.search();
         });*/
-        //$('.filterPaymentMethod').select2();
+        //$('.filterPaymentMethod').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
 
         function onlyNumberAmount(input) {

+ 6 - 4
resources/views/livewire/records_in_out.blade.php

@@ -386,7 +386,7 @@
                     }, 100);
                 });
 
-                $('.filterCausalsIn').select2();
+                $('.filterCausalsIn').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
                 $('.filterCausalsIn').on('change', function (e) {
                     var data = $('.filterCausalsIn').select2("val");
@@ -396,7 +396,7 @@
                     @this.set('filterCausalsIn', data);
                 });
 
-                $('.filterCausalsOut').select2();
+                $('.filterCausalsOut').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
 
 
                 $('.filterCausalsOut').on('change', function (e) {
@@ -435,6 +435,8 @@
             $("#collaptableOUT").treeFy({
                 treeColumn: 0
             });
+
+            $(".treetable-expander").trigger("click");
             
             /*
             $('.collaptableIN').aCollapTable({
@@ -457,13 +459,13 @@
         });
 
         Livewire.on('load-select', () => {
-            $('.filterCausalsIn').select2();
+            $('.filterCausalsIn').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.filterCausalsIn').on('change', function (e) {
                 var data = $('.filterCausalsIn').select2("val");
                 setTimeout(function() {createCollapse();}, 1000);
                 @this.set('filterCausalsIn', data);
             });
-            $('.filterCausalsOut').select2();
+            $('.filterCausalsOut').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.filterCausalsOut').on('change', function (e) {
                 var data = $('.filterCausalsOut').select2("val");
                 setTimeout(function() {createCollapse();}, 1000);

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

@@ -544,7 +544,7 @@
             });
             */
             $('.causalClass').each(function(i, obj) {
-                $(obj).select2();
+                $(obj).select2({"language": {"noResults": function(){return "Nessun risultato";}}});
                 $(obj).on('change', function (e) {
                     var data = $(obj).select2("val");
                     var name = $(obj).select2().attr("name");
@@ -570,17 +570,17 @@
                 @this.set('payment_method_id', data);
             });
 
-            $('.filterSupplier').select2();
+            $('.filterSupplier').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.filterSupplier').on('change', function (e) {
                 //var data = $('.filterSupplier').select2("val");
                 //@this.set('filterSupplier', data);
             });
-            $('.filterPaymentMethod').select2();
+            $('.filterPaymentMethod').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.filterPaymentMethod').on('change', function (e) {
                 //var data = $('.filterPaymentMethod').select2("val");
                 //@this.set('filterPaymentMethod', data);
             });
-            $('.filterCausals').select2();
+            $('.filterCausals').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             $('.filterCausals').on('change', function (e) {
                 //var data = $('.filterCausals').select2("val");
                 //@this.set('filterCausals', data);
@@ -592,17 +592,17 @@
             //pcsh2();
         });
 
-        $('.filterSupplier').select2();
+        $('.filterSupplier').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         $('.filterSupplier').on('change', function (e) {
             //var data = $('.filterSupplier').select2("val");
             //@this.set('filterSupplier', data);
         });
-        $('.filterPaymentMethod').select2();
+        $('.filterPaymentMethod').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         $('.filterPaymentMethod').on('change', function (e) {
             //var data = $('.filterPaymentMethod').select2("val");
             //@this.set('filterPaymentMethod', data);
         });
-        $('.filterCausals').select2();
+        $('.filterCausals').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         $('.filterCausals').on('change', function (e) {
             //var data = $('.filterCausals').select2("val");
             //@this.set('filterCausals', data);

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

@@ -204,7 +204,7 @@
             loadDataTable();
         } );
 
-        $('.filterType').select2();
+        $('.filterType').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         $('.filterType').on('change', function (e) {
             var data = $('.filterType').select2("val");
             if (data == null) data = [];
@@ -213,7 +213,7 @@
         });
 
         Livewire.on('load-data-table', () => {
-            $('.filterType').select2();
+            $('.filterType').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
             setTimeout(function() {loadDataTable()}, 100);
         });
 

+ 20 - 15
routes/web.php

@@ -686,7 +686,7 @@ Route::group(['middleware' => 'auth'],function(){
 
     Route::get('/get_course_list', function(){
 
-        $member_course = \App\Models\MemberCourse::with('member');
+        $member_course = \App\Models\MemberCourse::with('member')->with('course');
 
         if (isset($_GET["search"]["value"]))
         {
@@ -825,6 +825,7 @@ Route::group(['middleware' => 'auth'],function(){
                 $totalIsc[$sub] = $subPrice;
 
             $datas[] = array(
+                "column_19" => $x->course->name,
                 "column_0" => $x->member->last_name,
                 "column_1" => $x->member->first_name,
                 "column_2" => $x->subscribed . "§" . formatPrice($subPrice),
@@ -851,7 +852,7 @@ Route::group(['middleware' => 'auth'],function(){
         $count = $member_course->count();
 
         $js = '';
-        $xx = 3;
+        $xx = 4;
         $str = '';
         if ($count > 0)
         {
@@ -863,18 +864,18 @@ Route::group(['middleware' => 'auth'],function(){
         $str = "";
         foreach($totals as $z => $t)
         {
-            if ($z == 1) $xx = 8;
-            if ($z == 2) $xx = 9;
-            if ($z == 3) $xx = 10;
-            if ($z == 4) $xx = 11;
-            if ($z == 5) $xx = 12;
-            if ($z == 6) $xx = 13;
-            if ($z == 7) $xx = 14;
-            if ($z == 8) $xx = 15;
-            if ($z == 9) $xx = 4;
-            if ($z == 10) $xx = 5;
-            if ($z == 11) $xx = 6;
-            if ($z == 12) $xx = 7;
+            if ($z == 1) $xx = 9;
+            if ($z == 2) $xx = 10;
+            if ($z == 3) $xx = 11;
+            if ($z == 4) $xx = 12;
+            if ($z == 5) $xx = 13;
+            if ($z == 6) $xx = 14;
+            if ($z == 7) $xx = 15;
+            if ($z == 8) $xx = 16;
+            if ($z == 9) $xx = 5;
+            if ($z == 10) $xx = 6;
+            if ($z == 11) $xx = 7;
+            if ($z == 12) $xx = 8;
             $str = '';
             foreach($t as $x => $c)
             {
@@ -886,7 +887,11 @@ Route::group(['middleware' => 'auth'],function(){
         }
 
         if (isset($_GET["order"]))
-            array_multisort(array_column($datas, 'column_' . ($_GET["order"][0]["column"] - 1)), $_GET["order"][0]["dir"] == "asc" ? SORT_ASC : SORT_DESC, SORT_NATURAL|SORT_FLAG_CASE, $datas);
+        {
+            $s = $_GET["order"][0]["column"];
+            if ($s == 1) $s = 21;
+            array_multisort(array_column($datas, 'column_' . ($s - 2)), $_GET["order"][0]["dir"] == "asc" ? SORT_ASC : SORT_DESC, SORT_NATURAL|SORT_FLAG_CASE, $datas);
+        }
 
         $xxx = 1;
         foreach($datas as $yyy => $d)