From 2e732505abf529d4d360c698ca1af4519c9ee82e Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Mon, 23 Jun 2025 19:57:02 +0200
Subject: [PATCH] =?UTF-8?q?Kalender=20Anpassungen=20-=20Kalender=20Freigab?=
 =?UTF-8?q?en=20f=C3=BCr=20Conny?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Layout/default/TimerecordingBilling/Overview.php      |  3 +++
 .../TimerecordingBillingController.php                | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/Layout/default/TimerecordingBilling/Overview.php b/Layout/default/TimerecordingBilling/Overview.php
index 31cc71f21..56323c3be 100644
--- a/Layout/default/TimerecordingBilling/Overview.php
+++ b/Layout/default/TimerecordingBilling/Overview.php
@@ -41,6 +41,7 @@
                     <th class="text-center">Mitarbeiter</th>
                     <th class="text-center">LZ</th>
                     <th class="text-center">NLZ</th>
+                    <th class="text-center">Urlaub</th>
                     <th class="text-center">LZ + NLZ</th>
                     <th class="text-center">Sollst.</th>
                     <th class="text-center">Sollabweichung</th>
@@ -61,6 +62,7 @@
                     <th class="text-center"></th>
                     <th class="text-center"></th>
                     <th class="text-center"></th>
+                    <th class="text-center"></th>
                     <?php if ($me->superexpertEnabled()): ?>
                         <th></th>
                     <?php endif; ?>
@@ -105,6 +107,7 @@
                         <td data-order="<?= $timerecordingbillingsemployee->timerecordingEmployee->user->name . $timerecordingbillingsemployee->timerecordingBilling->month ?>"><?= "(" . $employee_number . ") " . $timerecordingbillingsemployee->timerecordingEmployee->user->name ?></td>
                         <td class="text-center"><?= number_format(round($timerecordingbillingsemployee->ishours / 3600, 2), "2", ",", ".") ?></td>
                         <td class="text-center"><?= $nlz ?></td>
+                        <td class="text-center"><?= $holidays[$timerecordingbillingsemployee->timerecordingEmployee->user_id] ?></td>
                         <td class="text-center"><?= number_format(round($timerecordingbillingsemployee->ishourssum / 3600, 2), "2", ",", ".") ?></td>
                         <td class="text-center"><?= number_format(round($timerecordingbillingsemployee->musthours / 3600, 2), "2", ",", ".") ?></td>
                         <td class="text-center"><?= number_format(round(($timerecordingbillingsemployee->ishourssum - $timerecordingbillingsemployee->musthours) / 3600, 2), "2", ",", ".") ?></td>
diff --git a/application/TimerecordingBilling/TimerecordingBillingController.php b/application/TimerecordingBilling/TimerecordingBillingController.php
index 118e0995a..6ea03fe6c 100644
--- a/application/TimerecordingBilling/TimerecordingBillingController.php
+++ b/application/TimerecordingBilling/TimerecordingBillingController.php
@@ -42,9 +42,20 @@ class TimerecordingBillingController extends mfBaseController
     {
         $timerecordingBillings = TimerecordingBillingModel::getAll();
         $timerecordingBillingsEmployees = TimerecordingBillingEmployeeModel::getAllOrderbyNameDate();
+
+        $timerecordingemployees = TimerecordingEmployeeModel::getAll();
+        $enddate = strtotime("2024-12-31 23:59:59");
+        foreach ($timerecordingemployees as $timerecordingemployee) {
+            if ($timerecordingemployee->bmd_active == 0 && empty($timerecordingemployee->startdate) && empty($timerecordingemployee->enddate)) continue;
+            echo $timerecordingemployee->user_id . "<br>";
+            echo $enddate. "<br>";
+            $holidays[$timerecordingemployee->user_id] = $this->getholidays($timerecordingemployee->user_id, $enddate);
+        }
         $this->layout()->setTemplate("TimerecordingBilling/Overview");
         $this->layout()->set("timerecordingbillings", $timerecordingBillings);
+
         $this->layout()->set("timerecordingbillingsemployees", $timerecordingBillingsEmployees);
+        $this->layout()->set("holidays", $holidays);
     }
 
     protected function detailClosedAction($timerecordingBilling)