Fix

resources/views/livewire/course_list.blade.php

@@ -509,7 +509,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -526,7 +526,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -543,7 +543,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -560,7 +560,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -577,7 +577,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -594,7 +594,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -611,7 +611,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -628,7 +628,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -645,7 +645,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -662,7 +662,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -679,7 +679,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
@@ -696,7 +696,7 @@
                             }
                             else
                             {
-                                if (x[0] != 'grey')
+                                if (x[0] != 'wgrey')
                                     ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;

resources/views/livewire/member.blade.php

@@ -2369,7 +2369,7 @@
                             {
                                 const d = data.split("|");
 
-                                ret += '<b class=" tablesaw-cell-label">Scadenza certificato</b>';
+                                //ret += '<b class=" tablesaw-cell-label">Scadenza certificato</b>';
                                 ret += '<span class="tablesaw-cell-content d-flex align-items-center">';
                                 if (d[0] == "0")
                                 {

routes/web.php

@@ -751,7 +751,7 @@ Route::group(['middleware' => 'auth'],function(){
             {
 
                 $cls = getColor($x->months, $i);
-                if ($cls != 'grey')
+                if ($cls != 'wgrey')
                 {
 
                     if (!isset($totals[$i]))
@@ -1140,11 +1140,19 @@ Route::group(['middleware' => 'auth'],function(){
 
     });
 
-
+function sortByColor($c)
+{
+    $return = "0";
+    if ($c == "green") $return = "1";
+    if ($c == "yellow") $return = "2";
+    if ($c == "orange") $return = "3";
+    if ($c == "wgrey") $return = "4";    
+    return $return;
+}
 
 function getColor($months, $m)
 {
-    $class = "grey";
+    $class = "wgrey";
     foreach(json_decode($months) as $mm)
     {
         if ($mm->m == $m)