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

Merge branch 'spidev' into 'master'

Browse Source 
Zeiterfassung Feature Updates

See merge request fronk/thetool!2097
This commit is contained in:
Daniel Spitzer
2026-02-13 08:32:56 +00:00
parent bc0b53b06a 0241d5842b
commit 0d475eae0c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Layout/default/TimerecordingReportExport/Index.php
View File

@@ -38,7 +38,7 @@
<form class="form-horizontal" method="post"
action="<?= self::getUrl("TimerecordingReportExport", "exportdeadline") ?>">
<h3 class="fs-2 text-body-emphasis">Auswertungen Stichtag <i
class="fa-duotone fa-solid fa-file-xls fa-xls-calendar"></i></h3>
class="fadl fa-file-xls fa-xls-calendar"></i></h3>
<p>Hier wird eine XLS Auswertung pro Mitarbeiter generiert mit Urlaub, Mehrstunden und
Gutstunden
zum Stichtag X<br>
@@ -62,7 +62,7 @@
<form class="form-horizontal" method="post"
action="<?= self::getUrl("TimerecordingReportExport", "generateworkdaysdetail") ?>">
<h3 class="fs-2 text-body-emphasis">Soll/Ist Detail Auswertung <i
class="fa-duotone fa-solid fa-file-xls fa-xls-calendar"></i></h3>
class="fadl fa-file-xls fa-xls-calendar"></i></h3>
<p>Hier wird eine XLS Auswertung pro Mitarbeiter generiert mit Soll, Ist und Differenz für jeden Arbeitstag im Monat.<br>
</p>
<div class="row">

7
application/TimerecordingReportExport/TimerecordingReportExportController.php
View File

@@ -105,11 +105,16 @@ class TimerecordingReportExportController extends mfBaseController
if (!isset($istPerDay[$day])) $istPerDay[$day] = 0;
$seconds = $tr->end - $tr->start;
$istPerDay[$day] += $seconds;
} else if ($cat->hourday == 6 || $cat->hourday == 10) {
} else if ($cat->hourday == 6) {
$day = date('Y-m-d', $tr->start);
if (!isset($istPerDay[$day])) $istPerDay[$day] = 0;
$seconds = $tr->end - $tr->start;
$istPerDay[$day] += $seconds;
} else if ($cat->hourday == 10) {
$day = date('Y-m-d', $tr->start);
if (!isset($istPerDay[$day])) $istPerDay[$day] = 0;
$seconds = $tr->end - $tr->start;
$istPerDay[$day] -= $seconds;
} else if ($cat->hourday == 2 || $cat->hourday == 3) {
$calcstart = max($tr->start, $month_start);
$calcend = $tr->end ? min($tr->end, $month_end) : min(time(), $month_end);