From bfbf9a1c1231855c16b943f9505cdc3cf0bd1792 Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Mon, 23 Jun 2025 20:48:55 +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

---
 application/Timerecording/TimerecordingModel.php     |  9 ++++++++-
 .../TimerecordingBillingController.php               | 12 ++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/application/Timerecording/TimerecordingModel.php b/application/Timerecording/TimerecordingModel.php
index d7f86a1da..f4ab93074 100644
--- a/application/Timerecording/TimerecordingModel.php
+++ b/application/Timerecording/TimerecordingModel.php
@@ -192,9 +192,16 @@ class TimerecordingModel
         if (array_key_exists("start", $filter) && array_key_exists("days", $filter)) {
             $days = $filter['days'];
             $start = $filter['start'];
+            $end= $filter['endsdate'];
             if ($days === 1) {
-                $where .= " AND `start` >= $start AND `days` !=0 ORDER by start ASC";
+                $where .= " AND `start` >= $start AND `days` !=0 ";
             }
+            if ($end) {
+                if (is_numeric($end)) {
+                    $where .= " AND `start` <= $end ";
+                }
+            }
+            $where.=" ORDER by start ASC";
         }
         if (array_key_exists("timerecordingCar_id", $filter)) {
             $timerecordingCar = $filter['timerecordingCar_id'];
diff --git a/application/TimerecordingBilling/TimerecordingBillingController.php b/application/TimerecordingBilling/TimerecordingBillingController.php
index 6ea03fe6c..bfa6fd64e 100644
--- a/application/TimerecordingBilling/TimerecordingBillingController.php
+++ b/application/TimerecordingBilling/TimerecordingBillingController.php
@@ -44,13 +44,13 @@ class TimerecordingBillingController extends mfBaseController
         $timerecordingBillingsEmployees = TimerecordingBillingEmployeeModel::getAllOrderbyNameDate();
 
         $timerecordingemployees = TimerecordingEmployeeModel::getAll();
-        $enddate = strtotime("2024-12-31 23:59:59");
+        $enddate = strtotime("01." . '12.2024');
+        $enddate = strtotime("last day of this month", $enddate);
+        $enddate = strtotime("23:59:59", $enddate);
         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);
 
@@ -859,7 +859,7 @@ class TimerecordingBillingController extends mfBaseController
 
     protected function getholidays($userid, $enddate)
     {
-//        $enddate = strtotime("01." . $date);
+//        $enddate = strtotime("01." . '12.2024');
 //        $enddate = strtotime("last day of this month", $enddate);
 //        $enddate = strtotime("23:59:59", $enddate);
 
@@ -881,7 +881,7 @@ class TimerecordingBillingController extends mfBaseController
                 $holidays_now = $holidays;
             }
             $timerecordings = TimerecordingModel::search(['user_id' => $userid, 'start' => $holidays_timestamp, 'timerecordingCategory_id' => 3]);
-            $timerecordingscorrections = TimerecordingModel::search(['user_id' => $userid, 'start' => $holidays_timestamp, 'days' => 1]);
+            $timerecordingscorrections = TimerecordingModel::search(['user_id' => $userid, 'start' => $holidays_timestamp,'endsdate' => $enddate, 'days' => 1]);
             foreach ($timerecordings as $timerecording) {
 
                 if ($timerecording->end > $enddate) {