From 0722aa026598ccb4f6ba23132f7b8abbd078b0b1 Mon Sep 17 00:00:00 2001
From: Spitzer Daniel <daniel.spitzer@inode.at>
Date: Tue, 5 Mar 2024 09:00:24 +0100
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update=20=20*=20Neue=20migratio?=
 =?UTF-8?q?n=20f=C3=BCr=20Homeoffice/Urlaubs=C3=A4nderungen=20=20*=20Soll?=
 =?UTF-8?q?=20zeiten=20nun=20vom=20Startdatum=20abh=C3=A4ngig=20=20*=20Neu?=
 =?UTF-8?q?e=20Summierung=20der=20Sollzeiten=20in=20der=20Personalverwaltu?=
 =?UTF-8?q?ng=20=20*=20Urlaubstage=20werden=20nun=20Tage=20statt=20Stunden?=
 =?UTF-8?q?=20angezeigt=20(in=20Buchungen=20und=20Auswertungen)=20=20*=20U?=
 =?UTF-8?q?rlaube=20werden=20nun=20bis=201.1.2024=20ber=C3=BCcksichtigt=20?=
 =?UTF-8?q?=20*=20Homeoffice=20Flag=20nun=20m=C3=B6glich=20=20*=20Abwesenh?=
 =?UTF-8?q?eitskalender=20Sichtbar=20f=C3=BCr=20alle=20=20*=20Neuer=20Buch?=
 =?UTF-8?q?ungszeitraum=20f=C3=BCr=20Urlaubsgutschrift/Urlaubsminderung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/TimerecordingCalendar/Index.php   | 21 +++++++++++--------
 .../TimerecordingReportController.php         |  2 ++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Layout/default/TimerecordingCalendar/Index.php b/Layout/default/TimerecordingCalendar/Index.php
index 502f4d150..ae9f2b5dd 100644
--- a/Layout/default/TimerecordingCalendar/Index.php
+++ b/Layout/default/TimerecordingCalendar/Index.php
@@ -223,16 +223,19 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                         }
                         oldname = value.user.user;
                     }
-                    holidays.push({
-                        id: cindex,
-                        backgroundColor: bgcolors[colorcount],
-                        start: value.cstart.cstart,
-                        end: value.cend.cend,
-                        title: value.ccategory.ccategory + " " + value.user.user,
-                        description: value.ccategory.ccategory + " " + value.user.user
-                    });
+                    if (value.hourday.hourday!='5') {
+                        holidays.push({
+                            id: cindex,
+                            backgroundColor: bgcolors[colorcount],
+                            start: value.cstart.cstart,
+                            end: value.cend.cend,
+                            title: value.ccategory.ccategory + " " + value.user.user,
+                            description: value.ccategory.ccategory + " " + value.user.user
+                        });
+                        cindex++;
+                    }
                     oldname = value.user.user;
-                    cindex++;
+
                 });
 
                 var initialLocaleCode = 'en';
diff --git a/application/TimerecordingReport/TimerecordingReportController.php b/application/TimerecordingReport/TimerecordingReportController.php
index 6d97f26e3..91de31b94 100644
--- a/application/TimerecordingReport/TimerecordingReportController.php
+++ b/application/TimerecordingReport/TimerecordingReportController.php
@@ -319,6 +319,8 @@ class TimerecordingReportController extends mfBaseController
                     'category' => array('category' => $category, 'order' => $timerecording->timerecordingCategory->name),
                     'comment' => array('comment' => $timerecording->comment, 'order' => $timerecording->comment),
                     'edit' => array('edit' => $edit, 'order' => $edit),
+                    'hourday' => array('hourday' => $timerecording->timerecordingCategory->hourday, 'order' => $timerecording->timerecordingCategory->hourday),
+
                 );
             }
         endforeach;