From 5a3d1d16f00ca65c43e11392e22445f075628c3b Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Tue, 7 Oct 2025 11:47:36 +0200
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update=20*=20Nicht=20freigegebe?=
 =?UTF-8?q?ne=20Abwesenheiten=20werden=20nun=20in=20der=20Kalender=C3=BCbe?=
 =?UTF-8?q?rsicht=20strichliert=20dargestellt=20*=20Anpassungen=20in=20den?=
 =?UTF-8?q?=20Genehmigungsemails?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Layout/default/TimerecordingCalendar/Index.php    | 15 +++++++++------
 .../TimerecordingReportController.php             |  4 +++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Layout/default/TimerecordingCalendar/Index.php b/Layout/default/TimerecordingCalendar/Index.php
index 713181692..56c05fd10 100644
--- a/Layout/default/TimerecordingCalendar/Index.php
+++ b/Layout/default/TimerecordingCalendar/Index.php
@@ -35,6 +35,7 @@ $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 {
@@ -44,6 +45,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
         .fc .fc-list-event.fc-tentative td {
             border-bottom: 2px dashed currentColor;
         }
+
         .popper, .tooltip {
             position: absolute;
             z-index: 9999;
@@ -228,7 +230,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
     <script>
         var calendar;
         document.addEventListener('DOMContentLoaded', function () {
-            let requestUrl = "<?= self::getUrl("TimerecordingReport", "api", ['do' => 'getTimerecordings', 'datatype' => '3', 'datayear' => time(),'calendar'=>'1']) ?>";
+            let requestUrl = "<?= self::getUrl("TimerecordingReport", "api", ['do' => 'getTimerecordings', 'datatype' => '3', 'datayear' => time(), 'calendar' => '1']) ?>";
             var cindex = 1;
             var holiDays = [];
             var birthdays = [];
@@ -306,7 +308,8 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                             description: category + " " + value.user.user,
                             extendedProps: {
                                 approved: Number(value?.approved?.approved ?? 1),
-                                hourday:  Number(value?.hourday?.hourday ?? -1)
+                                hourday: Number(value?.hourday?.hourday ?? -1),
+                                approval: Number(value?.approval?.approval ?? 0),
                             }
                         });
                         cindex++;
@@ -367,11 +370,11 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                             container: 'body'
                         });
                     },
-                    eventClassNames: ({ event }) => {
+                    eventClassNames: ({event}) => {
                         const approved = Number(event.extendedProps?.approved ?? 1);
-                        const hourday  = Number(event.extendedProps?.hourday ?? -1);
-
-                        if (approved === 0 && (hourday === 2 || hourday === 6)) {
+                        const approval = Number(event.extendedProps?.approval ?? 0);
+                        const hourday = Number(event.extendedProps?.hourday ?? -1);
+                        if (approved === 0 && approval === 1 && (hourday === 2 || hourday === 6)) {
                             return ['fc-tentative'];
                         }
                         return [];
diff --git a/application/TimerecordingReport/TimerecordingReportController.php b/application/TimerecordingReport/TimerecordingReportController.php
index 7c34ceee2..2444602cb 100644
--- a/application/TimerecordingReport/TimerecordingReportController.php
+++ b/application/TimerecordingReport/TimerecordingReportController.php
@@ -545,7 +545,9 @@ 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)
+                    'approved' => array('approved' => $timerecording->approved, 'order' => $timerecording->approved),
+                    'approval' => array('approval' => $timerecording->timerecordingCategory->approval, 'order' => $timerecording->timerecordingCategory->approval)
+
                 );
             }
         endforeach;