Zeiterfassung Update

* Fixed Header bei Auswertung und Verrechnung

Layout/default/TimerecordingBilling/DetailClosed.php

@@ -4,6 +4,8 @@
 
     <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
           type="text/css"/>
+    <link href="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.css" rel="stylesheet"
+          type="text/css"/>
     <style>
         .fa-arrow-right-from-bracket {
             margin-top: 3px;
@@ -37,7 +39,7 @@
 
         .filler-left {
             display: inline-block;
-            margin-right: 10px;
+            margin-right: 0px;
         }
 
         .filler-0 {
@@ -72,7 +74,8 @@
             font-size: 12px;
             margin-left: 5px;
             position: absolute;
-            top: 18px;
+            top: 21px;
+            right: 30px;
 
             color: #008b0b;
         }
@@ -91,7 +94,7 @@
             font-size: 12px;
             margin-left: 5px;
             position: absolute;
-            top: 18px;
+            top: 21px;
             right: 30px;
             color: #f1556c;
         }
@@ -125,10 +128,10 @@
             </div>
             <table id="datatable" class="table table-hover table-sm">
                 <thead>
-                <tr>
+                <tr class="bg-white">
                     <th class="text-center">Mitarbeiter/PersNr.</th>
-                    <th class="text-center">Leistungszeiten</th>
-                    <th class="text-center">Nichtleistungszeiten</th>
+                    <th class="text-center">LZ</th>
+                    <th class="text-center">NLZ</th>
                     <th class="text-center">NLZ+LZ</th>
                     <th class="text-center">Sollst.</th>
                     <th class="text-center">Sollabweichung</th>
@@ -200,20 +203,20 @@
                         </td>
                         <td data-order="<?= $timerecording->plushours_all ?>"
                             data-transfer="<?= round($timerecording->transfer_plushours / 3600, 2) ?>"
-                            class="text-center transfer_plushours_info position-relative"><?= '<span class="filler-left">' . number_format(round($timerecording->plushours_all / 3600, 2), "2", ",", ".") ?></span><?= ($timerecording->plushours_all > 0) ? '<i class="fas fa-arrow-from-left change-difference"  data-toggle="modal" data-target="#overtimeModal"  data-hours="' . number_format(round($timerecording->plushours_all / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?><?= ($timerecording->transfer_plushours) ? '<span  class="sm-text-right ">' . round($timerecording->transfer_plushours * -1 / 3600, 2) . '</span>' : '' ?></td>
+                            class="text-center transfer_plushours_info position-relative"><?= '<span class="filler-left">' . number_format(round($timerecording->plushours_all / 3600, 2), "2", ",", ".") ?></span><?= ($timerecording->plushours_all > 0) ? '<i class="fas fa-arrow-from-left change-difference"  data-toggle="modal" data-target="#overtimeModal"  data-hours="' . number_format(round($timerecording->plushours_all / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?><?= ($timerecording->transfer_plushours) ? '<span  class="ignore-export sm-text-right ">' . round($timerecording->transfer_plushours * -1 / 3600, 2) . '</span>' : '' ?></td>
                         <td data-transfer="<?= round($timerecording->transfer_overtime / 3600, 2) ?>"
                             data-order="<?= $timerecording->timerecordingEmployee->overtime_now ?>"
                             class="text-center position-relative transfer_overtime_info"><?= '<span class="filler-left">' . number_format(round($timerecording->timerecordingEmployee->overtime_now / 3600, 2), "2", ",", ".") ?></span><?= ($timerecording->timerecordingEmployee->overtime_now > 0) ? '<i class="fas fa-arrow-from-left change-overtime"  data-toggle="modal" data-target="#overtimeModal"  data-hours="' . number_format(round($timerecording->timerecordingEmployee->overtime_now / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?><?= ($timerecording->transfer_overtime) ? '<span class=" ' . $overtimeclass . '">' . round($timerecording->transfer_overtime * -1 / 3600, 2) . '</span>' : '' ?></span></td>
                         <?php if ($me->superexpertEnabled()): ?>
                             <td data-order="<?= $timerecording->timerecordingEmployee->bpahours ?>"
-                                class="text-center position-relative"><?= ($timerecording->transfer_bpahours * -1 > 0) ? '<i class="fas fa-arrow-to-left change-bpa"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round($timerecording->transfer_bpahours * -1 / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?> <?= '<span class="filler-left">' . number_format(round($timerecording->timerecordingEmployee->bpahours / 3600, 2), "2", ",", ".") ?><?= ($timerecording->transfer_bpahours) ? '<span class="sm-text-left">' . (round($timerecording->transfer_bpahours * -1 / 3600, 2)) . '</span>' : '' ?> </span></td>
+                                class="text-center position-relative"><?= ($timerecording->transfer_bpahours * -1 > 0) ? '<i class="fas fa-arrow-to-left change-bpa"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round($timerecording->transfer_bpahours * -1 / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?> <?= '<span class="filler-left">' . number_format(round($timerecording->timerecordingEmployee->bpahours / 3600, 2), "2", ",", ".") ?><?= ($timerecording->transfer_bpahours) ? '<span class="ignore-export sm-text-left">' . (round($timerecording->transfer_bpahours * -1 / 3600, 2)) . '</span>' : '' ?> </span></td>
                         <?php endif; ?>
                         <td data-order="<?= $timerecording->plushours25 ?>"
-                            class="text-center position-relative"><?= ($timerecording->plushours25 > 0) ? '<i class="fas fa-arrow-to-left change-overtime-25"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round($timerecording->plushours25 / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?> <?= '<span class="filler-left">' . number_format(round($timerecording->plushours25 / 3600, 2), "2", ",", ".") ?></span></td>
+                            class="text-center position-relative "><?= ($timerecording->plushours25 > 0) ? '<i class="fas fa-arrow-to-left change-overtime-25"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round($timerecording->plushours25 / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?> <?= '<span class="filler-left">' . number_format(round($timerecording->plushours25 / 3600, 2), "2", ",", ".") ?></span></td>
                         <td data-order="<?= $timerecording->overtime50free ?>"
-                            class="text-center position-relative"><?= ($timerecording->overtime50free > 0) ? '<i class="fas fa-arrow-to-left change-overtime-50"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round($timerecording->overtime50free / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?> <?= '<span class="filler-left">' . number_format(round($timerecording->overtime50free / 3600, 2), "2", ",", ".") ?></span></td>
+                            class="text-center position-relative "><?= ($timerecording->overtime50free > 0) ? '<i class="fas fa-arrow-to-left change-overtime-50"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round($timerecording->overtime50free / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?> <?= '<span class="filler-left">' . number_format(round($timerecording->overtime50free / 3600, 2), "2", ",", ".") ?></span></td>
                         <td data-order="<?= $timerecording->overtime100free ?>"
-                            class="text-center position-relative"><?= ($timerecording->overtime100free > 0) ? '<i class="fas fa-arrow-to-left change-overtime-100"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round($timerecording->overtime100free / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?> <?= '<span class="filler-left">' . number_format(round($timerecording->overtime100free / 3600, 2), "2", ",", ".") ?></span></td>
+                            class="text-center position-relative "><?= ($timerecording->overtime100free > 0) ? '<i class="fas fa-arrow-to-left change-overtime-100"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round($timerecording->overtime100free / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '' ?> <?= '<span class="filler-left">' . number_format(round($timerecording->overtime100free / 3600, 2), "2", ",", ".") ?></span></td>
                         <td data-order="<?= $timerecording->diet ?>"
                             class="text-center"><?= number_format($timerecording->diet, 2, ',', '.') . " €" ?></td>
                         <td class="text-center"><?= $timerecording->homeoffice ?> T</td>
@@ -300,7 +303,8 @@
             </div>
         </div>
     </div>
-
+    <script type="text/javascript"
+            src="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.js"></script>
 
     <script type="text/javascript">
         var hidesearch = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
@@ -493,7 +497,8 @@
         });
     </script>
     <script type="text/javascript"
-            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
+            src="<?= self::getResourcePath() ?>assets/js/datatables-std2.js?<?= date('U') ?>"></script>
+
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>