Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Zeiterfassung Bugfix

Browse Source 
* Winterzeitanzeige Bug bei Sollstunden behoben
* Grafische Bugs bei Anzeige in nicht Vollbild behoben
This commit is contained in:
Daniel Spitzer
2024-10-21 19:53:49 +02:00
parent 827b3d89ee
commit 014b6fa52c
3 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
application/TimerecordingReport/TimerecordingReportController.php
View File

@@ -537,8 +537,12 @@ class TimerecordingReportController extends mfBaseController
$timestamp = $timestamp_montag;
for ($i = 1; $i <= 7; $i++) {
$dDate = date('Y-m-d', $timestamp);
$dDay = date('w', $timestamp);
$WintertimeCompensation = 0;
if (date('I', $timestamp) == 0) {
$WintertimeCompensation = 3600;
}
$dDate = date('Y-m-d', $timestamp + $WintertimeCompensation);
$dDay = date('w', $timestamp + $WintertimeCompensation);
if (!$holiDay[$dDate] && $dDate >= date('Y-m-d', $startdate) && $dDate <= date('Y-m-d', $enddate)) {
$mustSeconds = $mustSeconds + $workingHours[$dDay];
@@ -559,8 +563,12 @@ class TimerecordingReportController extends mfBaseController
$timestamp = $firstdate;
for ($i = 1; $i <= $daycount; $i++) {
$dDate = date('Y-m-d', $timestamp);
$dDay = date('w', $timestamp);
$WintertimeCompensation = 0;
if (date('I', $timestamp) == 0) {
$WintertimeCompensation = 3600;
}
$dDate = date('Y-m-d', $timestamp + $WintertimeCompensation);
$dDay = date('w', $timestamp + $WintertimeCompensation);
if (!$holiDay[$dDate] && $dDate >= date('Y-m-d', $startdate) && $dDate <= date('Y-m-d', $enddate)) {
$mustSeconds = $mustSeconds + $workingHours[$dDay];
}
@@ -578,8 +586,12 @@ class TimerecordingReportController extends mfBaseController
$timestamp = $firstdate;
for ($i = 1; $i <= $daycount; $i++) {
$dDate = date('Y-m-d', $timestamp);
$dDay = date('w', $timestamp);
$WintertimeCompensation = 0;
if (date('I', $timestamp) == 0) {
$WintertimeCompensation = 3600;
}
$dDate = date('Y-m-d', $timestamp + $WintertimeCompensation);
$dDay = date('w', $timestamp + $WintertimeCompensation);
if (!$holiDay[$dDate]) {
$mustSeconds = $mustSeconds + $workingHours[$dDay];
}
@@ -688,7 +700,7 @@ class TimerecordingReportController extends mfBaseController
} else if ($timerecording->timerecordingCategory->hourday == 2 || ($timerecording->timerecordingCategory->hourday == 3 && $timerecording->end)) {
$date = date("d.m.", $timerecording->start) . " - " . $daysgerm[date("w", $timerecording->end)] . " " . date("d.m.Y", $timerecording->end);
$datadate = date("Y-m-d", $timerecording->start);
$enddate = date("Y-m-d", $timerecording->end);
$enddate = date("Y-m-d", $timerecording->end + 7200);
$start = "-";
$end = "-";
$day = $daysgerm[date("w", $timerecording->start)];