Merge branch 'spidev' into 'master'

Zeiterfassung Feature/Bugfix

See merge request fronk/thetool!521

Layout/default/TimerecordingCalendar/Index.php

@@ -185,6 +185,25 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
         .fc-day-today .fc-daygrid-day-number {
             color: #fff;
         }
+
+        .fa-window-maximize, .fa-window-restore{
+            font-size: 20px;
+            cursor: pointer;
+            color: #323a36;
+
+        }
+        .card-fullscreen {
+            display: block;
+            z-index: 1040;
+            position: fixed;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            right: 0;
+            left: 0;
+            bottom: 0;
+            overflow: auto;
+        }
     </style>
     <script type="text/javascript"
             src="<?= self::getResourcePath() ?>assets/js/calendar/moment/moment.min.js?<?= $git_merge_ts ?>"></script>
@@ -198,6 +217,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
             src="<?= self::getResourcePath() ?>assets/js/calendar/tooltip.min.js?<?= $git_merge_ts ?>"></script>
 
     <script>
+        var calendar;
         document.addEventListener('DOMContentLoaded', function () {
             let requestUrl = "<?= self::getUrl("TimerecordingReport", "api", ['do' => 'getTimerecordings', 'datatype' => '3', 'datayear' => time()]) ?>";
             var cindex = 1;
@@ -313,7 +333,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                 };
                 var initialLocaleCode = 'en';
                 var calendarEl = document.getElementById('calendar');
-                var calendar = new FullCalendar.Calendar(calendarEl, {
+                 calendar = new FullCalendar.Calendar(calendarEl, {
                     locale: 'de',
                     themeSystem: 'bootstrap4',
                     headerToolbar: {
@@ -329,7 +349,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                             container: 'body'
                         });
                     },
-                    editable: true,
+                    editable: false,
                     droppable: true, // this allows things to be dropped onto the calendar
                     fixedWeekCount: true,
                     // height: 300,
@@ -415,6 +435,9 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                     <div class="float-left">
                         <h4 class="header-title">Abwesenheitskalender</h4>
                     </div>
+                    <div class="float-right mobile-hide ">
+                        <i id="card-size" class="fa-regular fa-window-maximize"></i>
+                    </div>
 
                 </div>
             </div>
@@ -437,8 +460,26 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
         var columnfilter = [7];
         var columnoptions = '<option value=""></option><option value="Offen">Offen</option><option value="Genehmigt">Genehmigt</option><option value="Abgelehnt">Abgelehnt</option>';
         $(document).ready(function () {
+            $('body').on('click', '.fa-window-maximize', function () {
+                $('.card').addClass('card-fullscreen');
+                $('#card-size').removeClass('fa-window-maximize').addClass('fa-window-restore');
+                calendar.setOption('height', "auto");
+                calendar.render();
+            });
 
-
+            $('body').on('click', '.fa-window-restore', function () {
+                $('.card').removeClass('card-fullscreen');
+                $('#card-size').removeClass('fa-window-restore').addClass('fa-window-maximize');
+                calendar.render();
+            });
+            $(document).keyup(function (e) {
+                if (e.key === "Escape") { // escape key maps to keycode `27`
+                    if ($('.card').hasClass('card-fullscreen')) {
+                        $('.card').removeClass('card-fullscreen');
+                        $('#card-size').removeClass('fa-window-restore').addClass('fa-window-maximize');
+                    }
+                }
+            });
         });
 
     </script>

Layout/default/TimerecordingCar/Index.php

@@ -41,7 +41,7 @@
             </div>
             <table id="datatable" class="table table-striped table-hover table-sm">
                 <thead>
-                <tr>
+                <tr  class="bg-white">
                     <th class="text-center">Kennzeichen</th>
                     <th class="text-center">Fahrzeugverwalter</th>
                     <th class="text-center">Marke</th>