members - modificato ordinamento data di nascita + "scadenza:"

resources/views/layouts/app.blade.php

@@ -162,6 +162,8 @@
                 print "Dashboard";
             if (Request::is('members'))
                 print "Utenti";
+            if (Request::is('members_archive'))
+                print "Archivio utenti";
             if (Request::is('suppliers'))
                 print "Fornitori";
             if (Request::is('in'))
@@ -265,7 +267,7 @@
                 <div id="accordionExample" style="width:100%">
                     <div class="accordion-item">
                         <h2 class="accordion-header linkMenu" id="headingOne" style="margin-top:50px;">
-                            <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="{{Request::is('members') || Request::is('suppliers') ? 'true' : 'false'}}" aria-controls="collapseOne">
+                            <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="{{Request::is('members') || Request::is('suppliers') || Request::is('members_archive') ? 'true' : 'false'}}" aria-controls="collapseOne">
                                 <i class="fas fa-user"></i>
                                 <span>Anagrafiche</span>
                             </button>

resources/views/livewire/member.blade.php

@@ -437,7 +437,7 @@
                                             <span class="tablesaw-cell-content"><span class="badge tessera-badge {{$record->status > 0 ? ($record->status == 2 ? 'active' : 'suspended') : ''}}">{{$record->status > 0 ? ($record->status == 2 ? 'Attivo' : 'Sospesa') : ''}}</span></span>
                                             <b class=" tablesaw-cell-label">Scadenza tessera</b>
                                             <span class="tablesaw-cell-content d-flex align-items-center">
-                                                {{$record->status ? 'Scadenza : ' : ($record->date != '' ? 'Scaduto : ' : '')}} {{$record->date != '' ? date("d/m/Y", strtotime($record->date)) : ''}}
+                                                {{$record->status ? 'Scadenza: ' : ($record->date != '' ? 'Scaduto : ' : '')}} {{$record->date != '' ? date("d/m/Y", strtotime($record->date)) : ''}}
                                             </span>
                                         </td>
                                         <td>
@@ -450,11 +450,11 @@
                                                     @endif
                                                     @if($record->certificate >= date("Y-m-d") && $record->certificate < date("Y-m-d", strtotime("+1 month")))
                                                         <i class="ico--ui check due me-2"></i>
-                                                        In scadenza :
+                                                        In scadenza:
                                                     @endif
                                                     @if($record->certificate >= date("Y-m-d", strtotime("+1 month")))
                                                         <i class="ico--ui check active me-2"></i>
-                                                        Scadenza :
+                                                        Scadenza:
                                                     @endif
                                                     {{$record->certificate != '' ? date("d/m/Y", strtotime($record->certificate)) : ''}}
                                                 </span>
@@ -2286,11 +2286,11 @@
                                 }
                                 if (d[0] == "1") {
                                     ret += '<i class="ico--ui check due me-2"></i>';
-                                    ret += 'In scadenza : ';
+                                    ret += 'In scadenza: ';
                                 }
                                 if (d[0] == "2") {
                                     ret += '<i class="ico--ui check active me-2"></i>';
-                                    ret += 'Scadenza : ';
+                                    ret += 'Scadenza: ';
                                 }
                                 ret += d[1];
                                 ret += '</span>';

routes/web.php

@@ -442,7 +442,7 @@ Route::group(['middleware' => 'tenant'], function () {
             if ($_GET["order"][0]["column"] == 2)
                 $column = 'phone';
             if ($_GET["order"][0]["column"] == 3)
-                $column = 'birth_date';
+                $column = 'years';
             if ($_GET["order"][0]["column"] == 4)
                 $column = 'birth_date';
             if ($_GET["order"][0]["column"] == 5)
@@ -459,6 +459,11 @@ Route::group(['middleware' => 'tenant'], function () {
                 elseif ($column == 'current_status') {
                     $x = $x->orderBy('to_complete', 'DESC');
                     $x = $x->orderBy($column, $_GET["order"][0]["dir"]);
+                } elseif ($column == 'years') {
+                    $column = 'birth_date';
+                    $dirs = ['asc' => 'desc', 'desc' => 'asc'];
+                    $x = $x->orderByRaw($column . ' IS NULL ' . $dirs[$_GET["order"][0]["dir"]])
+                        ->orderBy($column, $dirs[$_GET["order"][0]["dir"]]);
                 } elseif ($column == 'birth_date') {
                     $x = $x->orderByRaw($column . ' IS NULL ' . $_GET["order"][0]["dir"])
                         ->orderBy($column, $_GET["order"][0]["dir"]);