Zeiterfassung

* Fix 0 Tage Urlaubsanzeige Verrechnung abgeschlossen/Verrechnungs Monatsübersicht
 * Umbau Personaladministration für Conny
 * $git_merge_ts eingebaut
This commit is contained in:
Daniel Spitzer
2024-07-05 10:53:35 +02:00
parent 3d10967292
commit 2b7744bd20
6 changed files with 51 additions and 26 deletions
@@ -174,7 +174,9 @@
$nlz_details = json_decode($timerecording->nlz, true);
foreach ($nlz_details as $key => $nlz_detail) {
if ($nlz_detail < 100) {
$nlz .= $key . ": " . $nlz_detail . " Tag(e)<br>";
if ($nlz_detail > 0) {
$nlz .= $key . ": " . $nlz_detail . " Tag(e)<br>";
}
} else {
$nlz .= $key . ": " . round($nlz_detail / 3600, 2) . " Stunden<br>";
}
@@ -500,5 +502,4 @@
src="<?= self::getResourcePath() ?>assets/js/datatables-std2.js?<?= date('U') ?>"></script>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>