From 65d313b6d11a176b1a4d0c3c8831a937de2c0f79 Mon Sep 17 00:00:00 2001
From: Spitzer Daniel <daniel.spitzer@inode.at>
Date: Mon, 4 Mar 2024 12:26:35 +0100
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update=20=20*=20Soll=20zeiten?=
 =?UTF-8?q?=20nun=20vom=20Startdatum=20abh=C3=A4ngig=20=20*=20Neue=20Summi?=
 =?UTF-8?q?erung=20der=20Sollzeiten=20in=20der=20Personalverwaltung=20=20*?=
 =?UTF-8?q?=20Urlaubstage=20werden=20nun=20Tage=20statt=20Stunden=20angeze?=
 =?UTF-8?q?igt=20(in=20Buchungen=20und=20Auswertungen)=20=20*=20Urlaube=20?=
 =?UTF-8?q?werden=20nun=20bis=201.1.2024=20ber=C3=BCcksichtigt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Timerecording/TimerecordingController.php | 22 ++++++++++++++-----
 .../TimerecordingReportController.php         | 15 ++++++++++---
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php
index 0c5af6a36..5edcce29c 100644
--- a/application/Timerecording/TimerecordingController.php
+++ b/application/Timerecording/TimerecordingController.php
@@ -325,7 +325,8 @@ class TimerecordingController extends mfBaseController
                 $realholiDay[date('Y-m-d', $realHoliday->timestamp)] = $realHoliday->timestamp;
             }
             if (!$holidays_timestamp) {
-                $holidays_timestamp = $employee->startdate;
+                //$holidays_timestamp = $employee->startdate;
+                $holidays_timestamp = strtotime('2024-01-01 00:00:00');
                 $holidays_now = $holidays;
             }
             $timerecordings = TimerecordingModel::search(['user_id' => $userid, 'start' => $holidays_timestamp, 'timerecordingCategory_id' => 3]);
@@ -408,7 +409,7 @@ class TimerecordingController extends mfBaseController
         $isSeconds = 0;
         $holiDays = 0;
         $plusHours = 0;
-        $startdate=time();
+        $startdate = time();
         if (!$userid) {
             $userid = $this->me->id;
         }
@@ -527,6 +528,7 @@ class TimerecordingController extends mfBaseController
             $state = "";
             $enddate = "";
             $sum = "-";
+
             $day = "";
             $orderdate = $timerecording->start;
             if ($timerecording->timerecordingCategory->hourday == 1) {
@@ -561,12 +563,16 @@ class TimerecordingController extends mfBaseController
                 }
                 $summcounter = 0;
                 $savecounter = 0;
+                $sumdays = 0;
                 for ($i = $starttimecalc; $i <= $endtimecalc; $i = $i + 86400) {
                     $holidaycounter = $workingHours[date("w", $i)];
                     $daycheck = date("Y-m-d", $i);
                     if (!$holiDay[$daycheck]) {
-                        $isSeconds = $isSeconds + $holidaycounter;
-                        $summcounter = $summcounter + $holidaycounter;
+                        if ($holidaycounter) {
+                            $isSeconds = $isSeconds + $holidaycounter;
+                            $summcounter = $summcounter + $holidaycounter;
+                            $sumdays++;
+                        }
                     }
                     if ($savecounter == 1000) {
                         echo $savecounter;
@@ -577,8 +583,12 @@ class TimerecordingController extends mfBaseController
                 $seconds = $summcounter;
                 $minutes = floor(($seconds % 3600) / 60);
                 $hours = floor($seconds / 3600);
-                $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
-
+//                $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
+                if ($sumdays == 1 || $sumdays == 0) {
+                    $sum = $sumdays . " Tag";
+                } else if ($sumdays > 1) {
+                    $sum = $sumdays . " Tage";
+                }
             } else if ($timerecording->timerecordingCategory->hourday == 3 && !$timerecording->end) {
                 $date = date("d.m.Y", $timerecording->start) . " - " . $daysgerm[date("w", time())] . " " . date("d.m.Y", time());;
                 $datadate = date("Y-m-d", $timerecording->start);
diff --git a/application/TimerecordingReport/TimerecordingReportController.php b/application/TimerecordingReport/TimerecordingReportController.php
index 57b4b8273..c2a576960 100644
--- a/application/TimerecordingReport/TimerecordingReportController.php
+++ b/application/TimerecordingReport/TimerecordingReportController.php
@@ -189,13 +189,17 @@ class TimerecordingReportController extends mfBaseController
                 }
                 $summcounter = 0;
                 $savecounter = 0;
+                $sumdays = 0;
 //                echo $starttimecalc."<br>";
                 for ($i = $starttimecalc; $i <= $endtimecalc; $i = $i + 86400) {
                     $holidaycounter = $workingHours[$timerecording->user_id][date("w", $i)];
                     $daycheck = date("Y-m-d", $i);
                     if (!$holiDay[$daycheck]) {
-                        $isSeconds = $isSeconds + $holidaycounter;
-                        $summcounter = $summcounter + $holidaycounter;;
+                        if ($holidaycounter) {
+                            $isSeconds = $isSeconds + $holidaycounter;
+                            $summcounter = $summcounter + $holidaycounter;
+                            $sumdays++;
+                        }
                     }
                     if ($savecounter == 1000) {
                         echo $savecounter;
@@ -206,7 +210,12 @@ class TimerecordingReportController extends mfBaseController
                 $seconds = $summcounter;
                 $minutes = floor(($seconds % 3600) / 60);
                 $hours = floor($seconds / 3600);
-                $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
+//                $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
+                if ($sumdays == 1 || $sumdays == 0) {
+                    $sum = $sumdays . " Tag";
+                } else if ($sumdays > 1) {
+                    $sum = $sumdays . " Tage";
+                }
 
             } else if ($timerecording->timerecordingCategory->hourday == 3 && !$timerecording->end) {
                 $date = date("d.m.Y", $timerecording->start) . " - " . $daysgerm[date("w", time())] . " " . date("d.m.Y", time());;