Merge branch 'spidev' into 'master'

Zeiterfassung Update

See merge request fronk/thetool!1814

Layout/default/TimerecordingCalendar/Index.php

@@ -35,7 +35,15 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
         .fc .fc-button-primary:not(:disabled).fc-button-active:focus, .fc .fc-button-primary:not(:disabled):active:focus {
             box-shadow: none;
         }
+        .fc .fc-event.fc-tentative,
+        .fc .fc-timegrid-event.fc-tentative,
+        .fc .fc-daygrid-event.fc-tentative {
+            background-image: repeating-linear-gradient(45deg, transparent 0 6px, rgb(255 255 255 / 52%) 6px 12px);
+        }
 
+        .fc .fc-list-event.fc-tentative td {
+            border-bottom: 2px dashed currentColor;
+        }
         .popper, .tooltip {
             position: absolute;
             z-index: 9999;
@@ -209,7 +217,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
     <script type="text/javascript"
             src="<?= self::getResourcePath() ?>assets/js/calendar/moment/moment.min.js?<?= $git_merge_ts ?>"></script>
     <script type="text/javascript"
-            src="<?= self::getResourcePath() ?>assets/js/calendar/index.global.min.js?<?= $git_merge_ts ?>"</script>
+            src="<?= self::getResourcePath() ?>assets/js/calendar/index.global.min.js?<?= $git_merge_ts ?>"></script>
     <script type="text/javascript"
             src="<?= self::getResourcePath() ?>assets/js/calendar/moment/index.global.min.js?<?= $git_merge_ts ?>"></script>
     <script type="text/javascript"
@@ -295,7 +303,11 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                             start: value.cstart.cstart,
                             end: value.cend.cend,
                             title: category + " " + value.user.user,
-                            description: category + " " + value.user.user
+                            description: category + " " + value.user.user,
+                            extendedProps: {
+                                approved: Number(value?.approved?.approved ?? 1),
+                                hourday:  Number(value?.hourday?.hourday ?? -1)
+                            }
                         });
                         cindex++;
                     }
@@ -355,8 +367,17 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                             container: 'body'
                         });
                     },
+                    eventClassNames: ({ event }) => {
+                        const approved = Number(event.extendedProps?.approved ?? 1);
+                        const hourday  = Number(event.extendedProps?.hourday ?? -1);
+
+                        if (approved === 0 && (hourday === 2 || hourday === 6)) {
+                            return ['fc-tentative'];
+                        }
+                        return [];
+                    },
                     editable: false,
-                    droppable: true, // this allows things to be dropped onto the calendar
+                    droppable: true,
                     fixedWeekCount: true,
                     // height: 300,
                     initialView: 'dayGridMonth',
@@ -479,7 +500,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                 calendar.render();
             });
             $(document).keyup(function (e) {
-                if (e.key === "Escape") { // escape key maps to keycode `27`
+                if (e.key === "Escape") {
                     if ($('.card').hasClass('card-fullscreen')) {
                         $('.card').removeClass('card-fullscreen');
                         $('#card-size').removeClass('fa-window-restore').addClass('fa-window-maximize');

application/TimerecordingPermit/TimerecordingPermitController.php

@@ -62,6 +62,11 @@ class TimerecordingPermitController extends mfBaseController
         } else if ($timerecordingCategoriess[0]->hourday == "2") {
             $body .= 'von:  ' . date("d.m.Y", $timerecordings->start) . ' bis: ' . date("d.m.Y", $timerecordings->end) . '
             
+';
+        }
+        else if ($timerecordingCategoriess[0]->hourday == "6") {
+            $body .= 'von:  ' . date("d.m.Y H:i", $timerecordings->start) . ' bis: ' . date("H:i", $timerecordings->end) . '
+            
 ';
         }
         $body .= ucfirst($sendtext) . ' von:  ' . $this->me->name . '

application/TimerecordingReport/TimerecordingReportController.php

@@ -545,7 +545,7 @@ class TimerecordingReportController extends mfBaseController
                     'comment' => array('comment' => $timerecording->comment, 'order' => $timerecording->comment),
                     'edit' => array('edit' => $edit, 'order' => $edit),
                     'hourday' => array('hourday' => $timerecording->timerecordingCategory->hourday, 'order' => $timerecording->timerecordingCategory->hourday),
-
+                    'approved' => array('approved' => $timerecording->approved, 'order' => $timerecording->approved)
                 );
             }
         endforeach;