Przeglądaj źródła

Merge branch 'iao_team' of http://host.webmagistri.biz:3000/parisio/iao_team into iao_team

Luca Parisio 4 miesięcy temu
rodzic
commit
7bb702d42e

+ 1 - 1
app/Http/Livewire/Member.php

@@ -497,7 +497,7 @@ class Member extends Component
         }
 
         // Anni dal 2025 al 2040
-        for ($anno = 2025; $anno <= 2040; $anno++) {
+        for ($anno = 2025; $anno <= 2037; $anno++) {
             // Festività fisse
             $this->festivita[] = "$anno-01-01"; // Capodanno
             $this->festivita[] = "$anno-01-06"; // Epifania

+ 18 - 18
public/css/extra.css

@@ -33,37 +33,37 @@ table.tableHead thead {
 }
 .box-presenze
 {
-    padding:10px; 
-    border:1px solid green;
-    margin: 10px; 
-    border-radius: 10px; 
+    padding:10px;
+    border: 2px solid #0c6197;
+    margin: 10px;
+    border-radius: 10px;
     text-align: center;
-    color:green;
+    color: #0c6197;
 }
 .box-assenze
 {
-    padding:10px; 
-    border:1px solid red;
-    margin: 10px; 
-    border-radius: 10px; 
+    padding:10px;
+    border: 2px solid red;
+    margin: 10px;
+    border-radius: 10px;
     text-align: center;
     color:red;
 }
 .box-recupero
 {
-    padding:10px; 
-    border:1px solid violet;
-    margin: 10px; 
-    border-radius: 10px; 
+    padding:10px;
+    border: 2px solid #7136f6;
+    margin: 10px;
+    border-radius: 10px;
     text-align: center;
-    color:violet;
+    color: #7136f6;
 }
 .box-annullate
 {
-    padding:10px; 
-    border:1px solid gray;
-    margin: 10px; 
-    border-radius: 10px; 
+    padding:10px;
+    border: 2px solid gray;
+    margin: 10px;
+    border-radius: 10px;
     text-align: center;
     color:gray;
 }

+ 18 - 0
public/css/style.css

@@ -16776,6 +16776,24 @@ div.dt-container div.dt-length label {
       margin-left: 0 !important;
     }
   }
+  
+body #card--dashboard > .btn--ui:has(i[class*="fa-arrow-left"]) {
+  position: absolute;
+  top: 0;
+  margin: 0 !important;
+  left: 0;
+  border: none;
+  padding: 10px;
+  width: 40px;
+  height: 40px;
+  border-radius: 0 !important;
+  color: #0c6197;
+}
+
+body #card--dashboard > .btn--ui:has(i[class*="fa-arrow-left"]):hover {
+  color: white;
+  background-color: #0c6197 !important;
+}
   /* END CSS Ferrari - Modifiche UI */
 
 body div.dt-button-background {

+ 4 - 1
resources/views/livewire/member.blade.php

@@ -1150,6 +1150,7 @@
                                                 </select>
                                             </div>
                                         </div>
+                                        <br>
                                         <div class="row ">
                                             <div class="col-md-3">
                                                 <div class="box-presenze">
@@ -1178,9 +1179,10 @@
                                         </div>                                        
                                         <div class="row ">
                                             <div class="col-md-12">
-                                                  <canvas id="presenzeChart" style="padding:20px"></canvas>
+                                                    <canvas id="presenzeChart" style="padding:20px"></canvas>
                                             </div>
                                         </div>
+                                        @if (!empty($member_presences))
                                         <div class="row " style="height: 300px; overflow:auto; ">
                                             <div class="col-md-12">
                                                 <table class="table tablesaw tableHead tablesaw-stack tabella--presenze" id="tablesaw-350-2" style="min-width:700px">
@@ -1203,6 +1205,7 @@
                                                 </table>
                                             </div>
                                         </div>
+                                        @endif
                                     </div>
 
                                 @endif