From d4f19deddbbc53244d38f1b3583aeb85087b7f2c Mon Sep 17 00:00:00 2001
From: Spitzer Daniel <daniel.spitzer@inode.at>
Date: Thu, 28 Mar 2024 13:02:47 +0100
Subject: [PATCH] Zeiterfassungs Update  * Verrechnung Anpassungen NLZ und
 Aktuelle Gutstunden

---
 .../default/TimerecordingBilling/Detail.php   | 21 +++++++++++++------
 .../TimerecordingReportController.php         | 19 +++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/Layout/default/TimerecordingBilling/Detail.php b/Layout/default/TimerecordingBilling/Detail.php
index 71d10d391..75f4c5e8f 100644
--- a/Layout/default/TimerecordingBilling/Detail.php
+++ b/Layout/default/TimerecordingBilling/Detail.php
@@ -36,6 +36,7 @@
                     <th class="text-center">Sollstunden</th>
                     <th class="text-center">Iststunden</th>
                     <th class="text-center">Sollabweichung</th>
+                    <th class="text-center">Akuelle Gutstunden</th>
                     <th class="text-center">Akuelle Überstunden</th>
                     <th class="text-center">Nichtleistungszeiten</th>
                     <th class="text-center">Diäten</th>
@@ -51,6 +52,7 @@
                     <th></th>
                     <th></th>
                     <th></th>
+                    <th></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -60,11 +62,18 @@
                         $counter = 1;
                         foreach ($timerecording['data']['time']['daysum'] as $category => $value) {
                             if ($counter > 1) {
-                                $offdays .= "<br>";
+                                $offdays .= "</div>";
+                            }
+                            $offdays .= "<div>";
+                            if ($value < 100) {
+                                $offdays .= $category . ": " . $value . " Tag(e) ";
+                            } else {
+
+                                $offdays .= $category . ": " . sprintf('%02dh:%02dm', floor($value / 3600), floor($value / 60 % 60));
                             }
-                            $offdays .= $category . ": " . $value . " Tag(e) ";
                             $counter++;
                         }
+                        $offdays .= "</div>";
                     } else {
                         $offdays = "keine";
                     }
@@ -78,12 +87,12 @@
                             class="text-center"><?= $timerecording['data']['time']['is'] ?></td>
                         <td data-order="<?= $timerecording['data']['time']['summsecondsorder'] ?>"
                             class="text-center"><?= $timerecording['data']['time']['summseconds'] ?></td>
+                        <td data-order="<?= $timerecording['data']['time']['plushours_noworder'] ?>"
+                            class="text-center"><?= $timerecording['data']['time']['plushours_now'] ?></td>
                         <td data-order="<?= $timerecording['data']['time']['overtime_noworder'] ?>"
                             class="text-center"><?= $timerecording['data']['time']['overtime_now'] ?></td>
                         <td class=""><?= $offdays ?></td>
-                        <td class="text-center"><?= number_format($timerecording['data']['time']['diet'], 2, ',', '.') ?>
-                            €
-                        </td>
+                        <td class="text-center"><?= number_format($timerecording['data']['time']['diet'], 2, ',', '.') . " €" ?></td>
                         <td class="text-center"><?= $timerecording['data']['time']['homeoffice'] ?> Tag(e)</td>
                     </tr>
                 <?php endforeach; ?>
@@ -98,7 +107,7 @@
 
 
     <script type="text/javascript">
-        var hidesearch = [2, 3, 4, 5, 6, 7, 8, 9];
+        var hidesearch = [2, 3, 4, 5, 6, 8, 9];
 
         $(document).ready(function () {
             $('.buttons-excel').closest('div').append('<div ><button id="bmd-export" class="btn btn-info margina">BMD Import</button></div>');
diff --git a/application/TimerecordingReport/TimerecordingReportController.php b/application/TimerecordingReport/TimerecordingReportController.php
index 2fd32f5db..6fe936c3b 100644
--- a/application/TimerecordingReport/TimerecordingReportController.php
+++ b/application/TimerecordingReport/TimerecordingReportController.php
@@ -407,6 +407,7 @@ class TimerecordingReportController extends mfBaseController
         if ($employee) {
             $holiDays = $employee[0]->holidays;
             $plusHours = $employee[0]->plushours;
+            $plusHours_now = $employee[0]->plushours_now;
             $overtime_now = $employee[0]->overtime_now;
             $auto_workinghours = $employee[0]->auto_workinghours;
             $startdate = $employee[0]->startdate;
@@ -559,7 +560,15 @@ class TimerecordingReportController extends mfBaseController
                 } else {
                     $isSecondscleanarray[$timerecording->timerecordingCategory->short] = $seconds;
                 }
+
+
                 if ($timerecording->timerecordingCategory->short != "1000,1200,1400") {
+                    if (!$daysum[$timerecording->timerecordingCategory->name]) {
+                        $daysum[$timerecording->timerecordingCategory->name] = $seconds;
+                    } else {
+                        $daysum[$timerecording->timerecordingCategory->name] = $daysum[$timerecording->timerecordingCategory->name] + $seconds;
+                    }
+
                     $nlzTimes[$timerecording->id]['start'] = date("d.m.Y", $timerecording->start);
                     $nlzTimes[$timerecording->id]['end'] = date("d.m.Y", $timerecording->end);
                     $nlzTimes[$timerecording->id]['minutes'] = $seconds / 60;
@@ -747,6 +756,14 @@ class TimerecordingReportController extends mfBaseController
         } else {
             $summseconds = sprintf('%02dh:%02dm', floor($summseconds / 3600), floor($summseconds / 60 % 60));
         }
+        $plusHours_noworder = $plusHours_now;
+        if ($plusHours_now < 0) {
+            $plusHours_now = $plusHours_now * -1;
+            $plusHours_now = "-" . sprintf('%02dh:%02dm', floor($plusHours_now / 3600), floor($plusHours_now / 60 % 60));
+        } else {
+            $plusHours_now = sprintf('%02dh:%02dm', floor($plusHours_now / 3600), floor($plusHours_now / 60 % 60));
+        }
+
         $json['success'] = true;
         $json['time']['auto_workinghours'] = $auto_workinghours;
         $json['time']['is'] = $isSeconds;
@@ -756,6 +773,8 @@ class TimerecordingReportController extends mfBaseController
         $json['time']['mustorder'] = $mustSeconds;
         $json['time']['holidays'] = $holiDays;
         $json['time']['plushours'] = sprintf('%02dh:%02dm', floor($plusHours / 3600), floor($plusHours / 60 % 60));
+        $json['time']['plushours_now'] = $plusHours_now;
+        $json['time']['plushours_noworder'] = $plusHours_noworder;
         $json['time']['overtime_now'] = sprintf('%02dh:%02dm', floor($overtime_now / 3600), floor($overtime_now / 60 % 60));
         $json['time']['overtime_noworder'] = $overtime_now;
         $json['time']['homeoffice'] = $homeofficesum;