From ed99a4a0ca0af4359dd343a2aa706d573d0741a9 Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Fri, 5 Jul 2024 11:40:36 +0200
Subject: [PATCH] Zeiterfassung  * Umbau auf fixed Header aller Sites  *
 $git_merge_ts eingebaut

---
 .../TimerecordingBilling/DetailClosed.php     |  8 ++++----
 Layout/default/TimerecordingCar/Index.php     |  9 ++++++---
 .../default/TimerecordingCategories/Index.php | 17 +++++++++-------
 Layout/default/TimerecordingHoliday/Index.php | 20 ++++++++++---------
 Layout/default/TimerecordingPermit/Index.php  | 18 +++++++++++------
 public/assets/css/datatables-std.css          |  4 ++++
 6 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/Layout/default/TimerecordingBilling/DetailClosed.php b/Layout/default/TimerecordingBilling/DetailClosed.php
index f1d03d6be..e41688e11 100644
--- a/Layout/default/TimerecordingBilling/DetailClosed.php
+++ b/Layout/default/TimerecordingBilling/DetailClosed.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"/>
     <style>
         .fa-arrow-right-from-bracket {
@@ -306,7 +306,7 @@
         </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 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
@@ -499,7 +499,7 @@
         });
     </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 e413191e9..4b906473e 100644
--- a/Layout/default/TimerecordingCar/Index.php
+++ b/Layout/default/TimerecordingCar/Index.php
@@ -1,6 +1,8 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
     <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>
         table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) {
             padding-right: 10px;
@@ -48,7 +50,7 @@
                     <th class="text-center">$57a</th>
                     <th class="text-center">Fahrtenbuch</th>
                     <th class="text-center">Kilometerstand</th>
-                    <th class="edit-width"></th>
+                    <th class="edit-width-w70"></th>
                 </tr>
                 <tr id="filterrow">
                     <th></th>
@@ -105,7 +107,8 @@
 
     </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 = [8];
@@ -117,7 +120,7 @@
         });
     </script>
     <script type="text/javascript"
-            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= $git_merge_ts ?>"></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/TimerecordingCategories/Index.php b/Layout/default/TimerecordingCategories/Index.php
index 581e0327b..3f70046ce 100644
--- a/Layout/default/TimerecordingCategories/Index.php
+++ b/Layout/default/TimerecordingCategories/Index.php
@@ -1,7 +1,9 @@
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
-          type="text/css"/>
+<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"/>
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -35,7 +37,7 @@
             </div>
             <table id="datatable" class="table table-hover table-sm">
                 <thead>
-                <tr>
+                <tr class="bg-white">
                     <th class="text-center">Beizeichnung</th>
                     <th class="text-center">BMD KZ</th>
                     <th class="text-center">Buchungszeitraum</th>
@@ -43,7 +45,7 @@
                     <th class="text-center">Dienstreisemöglichkeit</th>
                     <th class="text-center">Anmerkung Pflichtfeld</th>
                     <th class="text-center">Nur Buchhaltung</th>
-                    <th class="edit-width"></th>
+                    <th class="edit-width-w70"></th>
                 </tr>
                 <tr id="filterrow">
                     <th></th>
@@ -83,7 +85,8 @@
 
     </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 = [7];
@@ -92,8 +95,8 @@
 
         });
     </script>
-    <script type="text/javascript"
-            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
+<script type="text/javascript"
+        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/TimerecordingHoliday/Index.php b/Layout/default/TimerecordingHoliday/Index.php
index 2f69ee505..818a19810 100644
--- a/Layout/default/TimerecordingHoliday/Index.php
+++ b/Layout/default/TimerecordingHoliday/Index.php
@@ -3,7 +3,9 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
 ?>
 
 
-    <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"/>
     <!-- start page title -->
     <div class="row">
@@ -39,10 +41,10 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
             </div>
             <table id="datatable" class="table table-hover table-sm">
                 <thead>
-                <tr>
-                    <th style="width: 200px;" class="text-center">Datum</th>
+                <tr class="bg-white">
+                    <th style="max-width: 200px; width: 200px" class="text-center">Datum</th>
                     <th class="text-center ">Name</th>
-                    <th class="edit-width desktop"></th>
+                    <th class="edit-width-w70 desktop"></th>
                 </tr>
                 <tr id="filterrow">
                     <th></th>
@@ -53,7 +55,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                 <tbody>
                 <?php foreach ($timerecordingholidays as $timerecordingholiday): ?>
                     <tr>
-                        <td data-order="<?= $timerecordingholiday->timestamp ?>"><?= $daysgerm[date("w", $timerecordingholiday->timestamp)] . " " . date("d.m.Y", $timerecordingholiday->timestamp) ?></td>
+                        <td class="text-left" data-order="<?= $timerecordingholiday->timestamp ?>"><?= $daysgerm[date("w", $timerecordingholiday->timestamp)] . " " . date("d.m.Y", $timerecordingholiday->timestamp) ?></td>
                         <td class="text-nowrap all"><?= $timerecordingholiday->description ?></td>
                         <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                             <a href="<?= self::getUrl("TimerecordingHoliday", "edit", ["id" => $timerecordingholiday->id]) ?>"><i
@@ -66,23 +68,23 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                 <?php endforeach; ?>
                 </tbody>
             </table>
-
         </div>
     </div>
 
     </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 = [2];
-
+        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/Layout/default/TimerecordingPermit/Index.php b/Layout/default/TimerecordingPermit/Index.php
index 172c83a18..2ffa841ec 100644
--- a/Layout/default/TimerecordingPermit/Index.php
+++ b/Layout/default/TimerecordingPermit/Index.php
@@ -1,7 +1,11 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php");
 $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
 ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?= date('U') ?>" rel="stylesheet"
+    <link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?= $git_merge_ts ?>" rel="stylesheet"
+          type="text/css"/>
+    <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>
@@ -75,7 +79,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
             </div>
             <table id="datatable" class="table table-hover table-sm">
                 <thead>
-                <tr>
+                <tr class="bg-white">
                     <th style="width: 200px;" class="text-center text-nowrap ">Datum</th>
                     <th style="width: 200px;" class="text-nowrap">Mitarbeiter</th>
                     <th class="text-nowrap text-center edit-width">Von</th>
@@ -84,7 +88,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                     <th class="text-center text-nowrap">Buchungsart</th>
                     <th class="text-center">Anmerkung</th>
                     <th class="text-center edit-width-large">Freigabe</th>
-                    <th class="edit-width text-center"></th>
+                    <th class="edit-width-w70 text-center"></th>
                 </tr>
                 <tr id="filterrow">
                     <th></th>
@@ -153,7 +157,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                     ?>
                     <tr class="">
                         <td data-order="<?= $orderdate ?>"
-                            class="text-nowrap "><?= $state ?><?= $day . " " . $date ?></td>
+                            class="text-nowrap text-left "><?= $state ?><?= $day . " " . $date ?></td>
                         <td class="text-nowrap "><?= $timerecording->user->name ?></td>
                         <td class="text-nowrap text-center"><?= $start ?></td>
                         <td class="text-nowrap text-center"><?= $end ?></td>
@@ -188,10 +192,12 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
 
     </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 = [2, 3, 4, 8];
+        var pageLength = 100;
         var columnfilter = [7];
         var columnoptions = '<option value=""></option><option selected="selected" value="Offen">Offen</option><option value="Genehmigt">Genehmigt</option><option value="Abgelehnt">Abgelehnt</option>';
         $(document).ready(function () {
@@ -200,7 +206,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
 
     </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 9b34c6f4c..32b8b27e4 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-w70 {
+    width: 70px;
+}
+
 .edit-width-medium {
     width: 90px;
 }