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

Zeiterfassung

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

14
Layout/default/TimerecordingBilling/Overview.php
View File

@@ -2,9 +2,9 @@
?>
<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= $git_merge_ts ?>" rel="stylesheet"
type="text/css"/>
<link href="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.css" rel="stylesheet"
<link href="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.css?<?= $git_merge_ts ?>" rel="stylesheet"
type="text/css"/>
<!-- start page title -->
<div class="row">
@@ -75,7 +75,9 @@
$nlz_details = json_decode($timerecordingbillingsemployee->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>";
}
@@ -113,15 +115,13 @@
</div>
</div>
<script type="text/javascript"
src="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.js"></script>
src="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.js?<?= $git_merge_ts ?>"></script>
<script type="text/javascript">
var hidesearch = [2, 3, 4, 5, 6, 7, 8, 9];
$(document).ready(function () {
});
@@ -129,6 +129,6 @@
</script>
<script type="text/javascript"
src="<?= self::getResourcePath() ?>assets/js/datatables-std2.js?<?= date('U') ?>"></script>
src="<?= self::getResourcePath() ?>assets/js/datatables-std2.js?<?= $git_merge_ts ?>"></script>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>