From 04976033edefe1d0107b2290f849efc1de8eac87 Mon Sep 17 00:00:00 2001
From: Spitzer Daniel <daniel.spitzer@inode.at>
Date: Tue, 27 Feb 2024 10:58:05 +0100
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update/Bugfix=20*=20Timerecordi?=
 =?UTF-8?q?ngReportController.php=20verweist=20in=20einer=20gewissen=20Dat?=
 =?UTF-8?q?enbank-Eintragskonstellation=20auf=20einen=20ung=C3=BCltigen=20?=
 =?UTF-8?q?Array=20Index.=20Hab=20die=20gesamtsollzeitberechnung=20tempor?=
 =?UTF-8?q?=C3=A4r=20ausgeschalten=20*=20Neu=20Migration=20(Vorbereiten=20?=
 =?UTF-8?q?der=20DB=20auf=20eigenes=20=C3=9C-Zeitkonto)=20*=20Kalender=20F?=
 =?UTF-8?q?eiertagsdescription=20angepasst=20*=20Geburtstage=20nun=20m?=
 =?UTF-8?q?=C3=B6glich=20in=20Personaladministration=20und=20Kalender=20*?=
 =?UTF-8?q?=20Initiale=20=C3=9Cberstunden=20sind=20nun=20m=C3=B6glich=20*?=
 =?UTF-8?q?=20Berechnung=20Urlaubstage=20nun=20exakt=20*=20Anzeige=20Mehrs?=
 =?UTF-8?q?tunden/=C3=9Cberstunden/Offene=20Urlaube=20in=20Personaladminis?=
 =?UTF-8?q?tration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Layout/default/TimerecordingEmployee/Index.php        | 11 ++++++++++-
 application/Timerecording/TimerecordingController.php |  3 +++
 .../TimerecordingEmployeeModel.php                    |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Layout/default/TimerecordingEmployee/Index.php b/Layout/default/TimerecordingEmployee/Index.php
index 28167f002..d0f1a795f 100644
--- a/Layout/default/TimerecordingEmployee/Index.php
+++ b/Layout/default/TimerecordingEmployee/Index.php
@@ -42,6 +42,9 @@ $type[3] = "Lehrling";
                         <th class="text-center">Start Zeitaufzeichnung</th>
                         <th class="text-center">Sollzeiten</th>
                         <th class="text-center">Sollstunden</th>
+                        <th class="text-center">Mehrstunden</th>
+                        <th class="text-center">Überstunden</th>
+                        <th class="text-center">Offene Urlaube</th>
                         <th class="text-center edit-width">Schnellbuchung</th>
                         <th class="edit-width"></th>
                     </tr>
@@ -53,6 +56,9 @@ $type[3] = "Lehrling";
                         <th></th>
                         <th></th>
                         <th></th>
+                        <th></th>
+                        <th></th>
+                        <th></th>
                     </tr>
                     </thead>
                     <tbody>
@@ -73,6 +79,9 @@ $type[3] = "Lehrling";
                             <td class="text-center"><?= ($timerecordingemployees[$timerecordinguser->id]['startdate']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['startdate']) : "-" ?></td>
                             <td class="text-center"><?= ($timerecordingworkinghours) ? $timerecordingworkinghours[$timerecordinguser->id]['datetimetext'] : "" ?></td>
                             <td class="text-center"><?= $sum ?></td>
+                            <td class="text-center"><?= sprintf('%02d:%02d', ($timerecordingemployees[$timerecordinguser->id]['plushours_now']/ 3600),($timerecordingemployees[$timerecordinguser->id]['plushours_now']/ 60 % 60)) ?></td>
+                            <td class="text-center"><?= sprintf('%02d:%02d', ($timerecordingemployees[$timerecordinguser->id]['overtime_now']/ 3600),($timerecordingemployees[$timerecordinguser->id]['overtime_now']/ 60 % 60)) ?></td>
+                            <td class="text-center"><?= ($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 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
@@ -91,7 +100,7 @@ $type[3] = "Lehrling";
 
 
     <script type="text/javascript">
-        var hidesearch = [6];
+        var hidesearch = [3,4,5,6,7,9];
 
         $(document).ready(function () {
 
diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php
index 455c7579b..b52c4943b 100644
--- a/application/Timerecording/TimerecordingController.php
+++ b/application/Timerecording/TimerecordingController.php
@@ -18,6 +18,9 @@ class TimerecordingController extends mfBaseController
 
     protected function indexAction()
     {
+        $this->updatePlushours($this->me->id);
+        $this->updateHolidays($this->me->id);
+
         $timerecordingCategoriess = TimerecordingCategoryModel::getAll();
         $this->layout()->set("timerecordingCategoriess", $timerecordingCategoriess);
         $this->layout()->setTemplate("Timerecording/Index");
diff --git a/application/TimerecordingEmployee/TimerecordingEmployeeModel.php b/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
index a4fce4ecd..a76f9a4a7 100644
--- a/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
+++ b/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
@@ -147,6 +147,9 @@ class TimerecordingEmployeeModel
                 $where .= " AND user_id=$userid";
             }
         }
+        if (array_key_exists("startdate", $filter)) {
+            $where .= " AND startdate is not null";
+        }
 
         //var_dump($filter, $where);exit;
         return $where;