From 2b7744bd20df91bb290d6fea583faf6977406a83 Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Fri, 5 Jul 2024 10:53:35 +0200
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20=20*=20Fix=200=20Tage=20Urlaubs?=
 =?UTF-8?q?anzeige=20Verrechnung=20abgeschlossen/Verrechnungs=20Monats?=
 =?UTF-8?q?=C3=BCbersicht=20=20*=20Umbau=20Personaladministration=20f?=
 =?UTF-8?q?=C3=BCr=20Conny=20=20*=20$git=5Fmerge=5Fts=20eingebaut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TimerecordingBilling/DetailClosed.php     |  5 +-
 .../default/TimerecordingBilling/Overview.php | 14 +++---
 Layout/default/TimerecordingCar/Index.php     |  4 +-
 .../default/TimerecordingEmployee/Index.php   | 46 +++++++++++++------
 public/assets/css/datatables-std.css          |  4 ++
 public/assets/js/datatables-std2.js           |  4 +-
 6 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/Layout/default/TimerecordingBilling/DetailClosed.php b/Layout/default/TimerecordingBilling/DetailClosed.php
index 2c94fae66..f1d03d6be 100644
--- a/Layout/default/TimerecordingBilling/DetailClosed.php
+++ b/Layout/default/TimerecordingBilling/DetailClosed.php
@@ -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"); ?>
\ No newline at end of file
diff --git a/Layout/default/TimerecordingBilling/Overview.php b/Layout/default/TimerecordingBilling/Overview.php
index 177e55536..c60c0dc9e 100644
--- a/Layout/default/TimerecordingBilling/Overview.php
+++ b/Layout/default/TimerecordingBilling/Overview.php
@@ -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"); ?>
\ No newline at end of file
diff --git a/Layout/default/TimerecordingCar/Index.php b/Layout/default/TimerecordingCar/Index.php
index 31c0e5bbb..e413191e9 100644
--- a/Layout/default/TimerecordingCar/Index.php
+++ b/Layout/default/TimerecordingCar/Index.php
@@ -1,5 +1,5 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <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"/>
     <style>
         table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) {
@@ -117,7 +117,7 @@
         });
     </script>
     <script type="text/javascript"
-            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
+            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= $git_merge_ts ?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/TimerecordingEmployee/Index.php b/Layout/default/TimerecordingEmployee/Index.php
index ad5b34698..033e3b471 100644
--- a/Layout/default/TimerecordingEmployee/Index.php
+++ b/Layout/default/TimerecordingEmployee/Index.php
@@ -3,7 +3,9 @@ $type[1] = "Angestellter";
 $type[2] = "Arbeiter";
 $type[3] = "Lehrling";
 ?>
-    <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?<?= $git_merge_ts ?>" rel="stylesheet"
           type="text/css"/>
     <style>
         .border-dark {
@@ -49,19 +51,22 @@ $type[3] = "Lehrling";
             <div class="col-lg-12">
                 <table id="datatable" class="table table-hover table-sm">
                     <thead>
-                    <tr>
+                    <tr class="bg-white">
+                        <th class="text-center edit-width-medium">Aktiv</th>
                         <th class="text-center">Mitarbeiter</th>
+                        <th class="text-center">Geburtstag</th>
                         <th class="text-center">Vertragsart</th>
-                        <th class="text-center">Start Zeitaufzeichnung</th>
+                        <th title="Zeiterfassung Start" class="text-center">ZE Start</th>
+                        <th title="Zeiterfassung Ende" class="text-center">ZE Ende</th>
                         <th class="text-center">Sollzeiten</th>
-                        <th class="text-center">Sollstunden</th>
+                        <th title="Sollstunden" class="text-center">Sollst.</th>
                         <th class="text-center">Mehrstunden</th>
                         <th class="text-center">Überstunden</th>
                         <?php if ($me->superexpertEnabled()): ?>
-                            <th class="text-center">Black P. Stunden</th>
+                            <th title="Black Pig Stunden" class="text-center edit-width-medium">B. P. St.</th>
                         <?php endif; ?>
-                        <th class="text-center">Offene Urlaube</th>
-                        <th class="text-center edit-width">Schnellbuchung</th>
+                        <th class="text-center" title="Offene Urlaube">Urlaubstage</th>
+                        <th class="text-center edit-width">Schnellb.</th>
                         <th class="edit-width"></th>
                     </tr>
                     <tr id="filterrow">
@@ -70,6 +75,9 @@ $type[3] = "Lehrling";
                         <th></th>
                         <th></th>
                         <th></th>
+                        <th></th>
+                        <th></th>
+                        <th></th>
                         <?php if ($me->superexpertEnabled()): ?>
                             <th></th>
                         <?php endif; ?>
@@ -109,9 +117,15 @@ $type[3] = "Lehrling";
                         ?>
 
                         <tr class="<?= ($timerecordingemployees[$timerecordinguser->id]['bmd_active'] == "0") ? "inactive_empoyee" : "" ?>">
+                            <td class="text-center pr-3"><?= ($timerecordingemployees[$timerecordinguser->id]['bmd_active'] == "0") ? "Nein" : "Ja" ?></td>
                             <td><?= $timerecordinguser->name ?></td>
+                            <td class="text-center"
+                                data-order="<?= $timerecordingemployees[$timerecordinguser->id]['birthday'] ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['birthday']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['birthday']) : "-" ?></td>
                             <td><?= $type[$timerecordingemployees[$timerecordinguser->id]['type']] ?></td>
-                            <td class="text-center"><?= ($timerecordingemployees[$timerecordinguser->id]['startdate']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['startdate']) : "-" ?></td>
+                            <td class="text-center"
+                                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"><?= $sum ?></td>
                             <td class="text-center"
@@ -124,7 +138,7 @@ $type[3] = "Lehrling";
                             <?php endif; ?>
                             <td class="text-center"
                                 data-order="<?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] : '' ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] . ' Tage' : '' ?> </td>
-                            <td class="text-center"><?= ($timerecordingemployees[$timerecordinguser->id]['auto_workinghours'] == '1') ? 'Ja' : 'Nein' ?></td>
+                            <td class="text-center pr-3"><?= ($timerecordingemployees[$timerecordinguser->id]['auto_workinghours'] == '1') ? 'Ja' : 'Nein' ?></td>
                             <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                                 <a href="<?= self::getUrl("TimerecordingEmployee", "edit", ['id' => $timerecordingemployees[$timerecordinguser->id]['id'], "userid" => $timerecordinguser->id]) ?>"><i
                                             class="far fa-edit" title="Bearbeiten"></i></a>
@@ -139,19 +153,25 @@ $type[3] = "Lehrling";
 
     </div>
     </div>
-
+    <script type="text/javascript"
+            src="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.js?<?= $git_merge_ts ?>"></script>
 
     <script type="text/javascript">
-        var hidesearch = [3, 4, 5, 6, 7, 9];
+        var hidesearch = [ 6, 7, 8, 9, 10,12];
+        var columnfilter = [0,11];
         <?php if ($me->superexpertEnabled()): ?>
-        hidesearch = [3, 4, 5, 6, 7,8 ,10];
+        var columnfilter = [0,12];
+        hidesearch = [ 6, 7, 8, 9, 10, 11,13];
         <?php endif; ?>
+
+        var columnoptions = '<option value=""></option><option value="Ja">Ja</option><option value="Nein">Nein</option>';
+        var pageLength = 100;
         $(document).ready(function () {
 
         });
     </script>
     <script type="text/javascript"
-            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
+            src="<?= self::getResourcePath() ?>assets/js/datatables-std2.js?<?= $git_merge_ts ?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/public/assets/css/datatables-std.css b/public/assets/css/datatables-std.css
index 64ed2180c..9b34c6f4c 100644
--- a/public/assets/css/datatables-std.css
+++ b/public/assets/css/datatables-std.css
@@ -46,6 +46,10 @@ table.dataTable > tbody > tr.child span.dtr-data {
     width: 50px;
 }
 
+.edit-width-medium {
+    width: 90px;
+}
+
 .edit-width-large {
     width: 128px;
 }
diff --git a/public/assets/js/datatables-std2.js b/public/assets/js/datatables-std2.js
index 969b7ee14..58f6a77f8 100644
--- a/public/assets/js/datatables-std2.js
+++ b/public/assets/js/datatables-std2.js
@@ -40,7 +40,7 @@ $('#filterrow th').each(function (i) {
     if (hidesearch.includes($(this).index())) {
 
     } else if (columnfilter.includes($(this).index())) {
-        $(this).html('<select style="padding: 0;height: 28px;;text-align: center;" id="selectsearch" class="form-control form-control-select form-control-special" data-index="' + i + '">' + columnoptions + '</select>');
+        $(this).html('<select style="padding: 0;height: 28px;;text-align: center;" id="selectsearch" class="form-control form-control-select form-control-special selectsearch" data-index="' + i + '">' + columnoptions + '</select>');
 
     } else {
         $(this).html('<input type="text" placeholder="' + title + '" class="form-control" data-index="' + i + '" value="" />');
@@ -135,7 +135,7 @@ $('#filterrow').on('keyup', 'input', function () {
 
 });
 
-$('#selectsearch').change(function () {
+$('.selectsearch').change(function () {
     table
         .column($(this).data('index'))
         .search(this.value)