Преглед изворни кода

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

ferrari пре 4 месеци
родитељ
комит
d7f875f26a
3 измењених фајлова са 23 додато и 20 уклоњено
  1. 18 18
      public/css/extra.css
  2. 1 1
      public/css/style.css
  3. 4 1
      resources/views/livewire/member.blade.php

+ 18 - 18
public/css/extra.css

@@ -33,37 +33,37 @@ table.tableHead thead {
 }
 }
 .box-presenze
 .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;
     text-align: center;
-    color:green;
+    color: #0c6197;
 }
 }
 .box-assenze
 .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;
     text-align: center;
     color:red;
     color:red;
 }
 }
 .box-recupero
 .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;
     text-align: center;
-    color:violet;
+    color: #7136f6;
 }
 }
 .box-annullate
 .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;
     text-align: center;
     color:gray;
     color:gray;
 }
 }

+ 1 - 1
public/css/style.css

@@ -16776,7 +16776,7 @@ div.dt-container div.dt-length label {
       margin-left: 0 !important;
       margin-left: 0 !important;
     }
     }
   }
   }
-
+  
 body #card--dashboard > .btn--ui:has(i[class*="fa-arrow-left"]) {
 body #card--dashboard > .btn--ui:has(i[class*="fa-arrow-left"]) {
   position: absolute;
   position: absolute;
   top: 0;
   top: 0;

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

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