From 5bfe5fb4e549f1ec1c0362ef43b56bc273e344a1 Mon Sep 17 00:00:00 2001 From: Spitzer Daniel Date: Tue, 5 Mar 2024 09:09:09 +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 --- application/Timerecording/TimerecordingController.php | 2 +- .../TimerecordingReport/TimerecordingReportController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php index b05da577a..b404daf9d 100644 --- a/application/Timerecording/TimerecordingController.php +++ b/application/Timerecording/TimerecordingController.php @@ -669,7 +669,7 @@ class TimerecordingController extends mfBaseController $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes); } else if ($timerecording->timerecordingCategory->hourday == 5) { - + $date = date("d.m.Y", $timerecording->start); $start = "-"; $end = "-"; $day = $daysgerm[date("w", $timerecording->start)]; diff --git a/application/TimerecordingReport/TimerecordingReportController.php b/application/TimerecordingReport/TimerecordingReportController.php index 91de31b94..0c380fed5 100644 --- a/application/TimerecordingReport/TimerecordingReportController.php +++ b/application/TimerecordingReport/TimerecordingReportController.php @@ -260,7 +260,7 @@ class TimerecordingReportController extends mfBaseController $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes); } else if ($timerecording->timerecordingCategory->hourday == 5) { - + $date = date("d.m.Y", $timerecording->start); $start = "-"; $end = "-"; $day = $daysgerm[date("w", $timerecording->start)];