Luca Parisio преди 1 година
родител
ревизия
a45ddfe0d7

+ 7 - 0
public/assets/js/app.js

@@ -9,15 +9,22 @@ var app = {
     }
   };
 
+  var size = 350;
   function pcsh1() {
     var x = document.getElementById("filter--section");
       x.classList.toggle("filterWrapper_open");
+      if (size == 350)
+        size = 0;
+      else
+        size = 350;
+      $("#resume-table").width( Math.round( $(window ).width() - size ) ) ;
   }
 
   function pcsh2() {
     var x = document.getElementById("filter--section");
     if (x.classList.contains("filterWrapper_open")) //
         x.classList.toggle("filterWrapper_open");
+        $("#resume-table").width( Math.round( $(window ).width()  ) ) ;
   }
 
 

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

@@ -351,7 +351,7 @@
         </div>
 
         <button id="open-filter" onclick="pcsh1()"></button>
-        <button id="close-filter" onclick="pcsh2()"></button>
+        
 
         <div class="col">
             <div class="row h-100">

+ 3 - 3
resources/views/livewire/course.blade.php

@@ -22,11 +22,11 @@
 
         <a class="btn--ui lightGrey" href="/settings?type=corsi"><i class="fa-solid fa-arrow-left"></i></a><br>
 
-        <div class="row mb-3 mt-3">
-            <div class="col-1 mt-2">
+        <div class="row  mt-3" style="margin-bottom:2rem !important;">
+            <div class="col-1 mt-4">
                 <h4>Anno</h4>
             </div>
-            <div class="col-2 mt-2">
+            <div class="col-2 mt-4">
                 <select class="form-select filterYear" onchange="reload()">
                     <option value="">--Seleziona--
                     @foreach($course_years as $c)

+ 14 - 6
resources/views/livewire/course_list.blade.php

@@ -161,6 +161,8 @@
                         <th style="padding-left:5px !important;padding-right:5px !important;"></th>
                         <th style="padding-left:5px !important;padding-right:5px !important;"></th>
                         <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                        <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                        <th style="padding-left:5px !important;padding-right:5px !important;"></th>
                     </tr>
                 </tfoot>
             </table>
@@ -181,7 +183,7 @@
     <style>
 
     .scrollTable {
-            margin: 20px auto;
+            
             padding: 15px;
             /*max-width: 800px !important;*/
             overflow-x: auto;
@@ -190,6 +192,11 @@
             border: 1px solid #ddd;
         }
 
+        ::-webkit-scrollbar-thumb {
+            background: #EDF0F2;
+            border-radius: 10px;
+        }
+
         .select2-container--default .select2-selection--single{
             background-color: #E9F0F5;
             border: 0.0625rem solid #DFE5EB;
@@ -733,7 +740,7 @@
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         },
-                                        footer: false
+                                        footer:false
                                     },
                                     {
                                         extend: 'pdfHtml5',"action":newexportaction,
@@ -741,7 +748,7 @@
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         },
-                                        footer: false
+                                        footer:false
                                     },
                                     {
                                         extend: 'print',"action":newexportaction,
@@ -750,7 +757,7 @@
                                         exportOptions: {
                                             columns: ":not(':last')"
                                         },
-                                        footer: false
+                                        footer:false
                                     }
                                 ],
                                 dropup: true
@@ -781,7 +788,7 @@
                     api.column(2).footer().innerHTML = '';
                     api.column(3).footer().innerHTML = '';
 
-                    for(var i=4; i<=14; i++)
+                    for(var i=4; i<=15; i++)
                     {
                         api.column(i).footer().innerHTML = '';
                     }
@@ -918,9 +925,10 @@
             $( 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() - 400 ) ) ;
+                 $("#resume-table").width( Math.round( $(window ).width() - size ) ) ;
             }
 
+
         });
 
     </script>

+ 9 - 2
resources/views/livewire/records.blade.php

@@ -215,6 +215,11 @@
             border: 1px solid #ddd;
         }
 
+        ::-webkit-scrollbar-thumb {
+            background: #EDF0F2;
+            border-radius: 10px;
+        }
+
         table thead {
         /* Important */
             position: sticky;
@@ -379,12 +384,14 @@
             setMaxWidth();
             $( window ).bind( "resize", setMaxWidth ); //Remove this if it's not needed. It will react when window changes size.
 
-            
+            $(".open-filter").click(function(){
+                setMaxWidth();
+            });
 
         });
 
         function setMaxWidth() {
-                $("#resume-table").width( Math.round( $(window ).width() - 350 ) ) ;
+                $("#resume-table").width( Math.round( $(window ).width() - size ) ) ;
             }
         /*
         const chart = new Chart(

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

@@ -560,7 +560,7 @@
             </form>
             </div>
             @if(!$corrispettivo_fiscale)
-            <div class="accountingEntry_resume card--ui" style="max-height:800px;">
+            <div class="accountingEntry_resume card--ui" style="max-height:800px;width:35% !important;">
                 <header>
                     <div class="username d-flex align-items-start">
                         <i class="ico--ui accountingResume me-2"></i>