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 Update

See merge request fronk/thetool!1840
This commit is contained in:
Daniel Spitzer
2025-10-11 17:12:32 +00:00
parent acd274b00b 6543e0b79b
commit 6fcdea330b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/TimerecordingEmployee/Index.php
View File

@@ -137,7 +137,7 @@ $type[3] = "Lehrling";
data-order="<?= $timerecordingemployees[$timerecordinguser->id]['startdate'] ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['startdate']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['startdate']) : "-" ?></td>
<td class="text-center"
data-order="<?= $timerecordingemployees[$timerecordinguser->id]['enddate'] ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['enddate']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['enddate']) : "-" ?></td>
<td class="text-center text-nowrap"><?= ($timerecordingworkinghours) ? $timerecordingworkinghours[$timerecordinguser->id]['datetimetext'] : "" ?></td>
<td class="text-center text-nowrap"><?= ($timerecordingemployees[$timerecordinguser->id]['night_allowance']) ? '<div class="float-left"><i class="fa-regular fa-moon"></i></div>' : '' ?><?= ($timerecordingworkinghours) ? '<div class="float-left">'.$timerecordingworkinghours[$timerecordinguser->id]['datetimetext'].'</div>' : "" ?></td>
<td class="text-center"><?= $sum ?></td>
<td class="text-center"
data-order="<?= ($timerecordingemployees[$timerecordinguser->id]['plushours_now']) ? $timerecordingemployees[$timerecordinguser->id]['plushours_now'] : 0 ?>"><?= $plusHours ?></td>