From 6e53d0f6d7205d6b53319f925d8575756e818ba8 Mon Sep 17 00:00:00 2001
From: Spitzer Daniel <daniel.spitzer@inode.at>
Date: Mon, 4 Mar 2024 14:26:03 +0100
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update=20=20*=20Neue=20migratio?=
 =?UTF-8?q?n=20f=C3=BCr=20Homeoffice=20=20*=20Soll=20zeiten=20nun=20vom=20?=
 =?UTF-8?q?Startdatum=20abh=C3=A4ngig=20=20*=20Neue=20Summierung=20der=20S?=
 =?UTF-8?q?ollzeiten=20in=20der=20Personalverwaltung=20=20*=20Urlaubstage?=
 =?UTF-8?q?=20werden=20nun=20Tage=20statt=20Stunden=20angezeigt=20(in=20Bu?=
 =?UTF-8?q?chungen=20und=20Auswertungen)=20=20*=20Urlaube=20werden=20nun?=
 =?UTF-8?q?=20bis=201.1.2024=20ber=C3=BCcksichtigt=20=20*=20Homeoffice=20F?=
 =?UTF-8?q?lag=20nun=20m=C3=B6glich=20=20*=20Abwesenheitskalender=20Sichtb?=
 =?UTF-8?q?ar=20f=C3=BCr=20alle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Layout/default/menu.php                          | 2 +-
 application/Timerecording/TimerecordingModel.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Layout/default/menu.php b/Layout/default/menu.php
index 1b45a2dfd..eb9cd226f 100644
--- a/Layout/default/menu.php
+++ b/Layout/default/menu.php
@@ -36,9 +36,9 @@
                 <li class="has-submenu"><a href="#"><i class="far fa-fw fa-calendar-clock"></i>Zeiterfassung <div class="arrow-down"></div></a>
                     <ul class="submenu">
                         <li><a href="<?=self::getUrl("Timerecording")?>"><i class="far fa-fw fa-calendar text-info"></i> Buchungen</a></li>
+                        <li><a href="<?=self::getUrl("TimerecordingCalendar")?>"><i class="far fa-fw fa-calendar-days text-info"></i> Abwesenheitskalender</a></li>
                         <?php if ($me->can('Fibu')): ?>
                         <li><a href="<?=self::getUrl("TimerecordingPermit")?>"><i class="far fa-fw fa-calendar-check text-info"></i> Freigaben</a></li>
-                        <li><a href="<?=self::getUrl("TimerecordingCalendar")?>"><i class="far fa-fw fa-calendar-days text-info"></i> Abwesenheitskalender</a></li>
                         <li><a href="<?=self::getUrl("TimerecordingReport")?>"><i class="far fa-fw fa-chart-pie text-info"></i> Auswertung/Korrektur</a></li>
                         <li><a href="<?=self::getUrl("TimerecordingCategory")?>"><i class="far fa-fw fa-list text-info"></i> Buchungsarten</a></li>
                         <li><a href="<?=self::getUrl("TimerecordingHoliday")?>"><i class="far fa-fw fa-umbrella-beach text-info"></i> Feiertage</a></li>
diff --git a/application/Timerecording/TimerecordingModel.php b/application/Timerecording/TimerecordingModel.php
index 5966253c4..39dd00e64 100644
--- a/application/Timerecording/TimerecordingModel.php
+++ b/application/Timerecording/TimerecordingModel.php
@@ -165,7 +165,7 @@ class TimerecordingModel
             $endtime = $filter['endtime'];
             $id = $filter['id'];
             if (is_numeric($starttime) && is_numeric($endtime)) {
-                $where .= " AND (((`start` <= $starttime AND `end` > $starttime ) OR (`start` > $endtime AND `end` < $endtime)  OR (`start` > $starttime AND `end` > $starttime AND `start` <= $endtime AND `end` < $endtime) OR (`start` > $starttime AND `end` > $starttime AND `start` < $endtime AND `end` > $endtime) OR (`start` = $starttime AND `end` = $endtime )) OR ( `start` <= $starttime AND `end` IS NULL))  ORDER by user_id ASC";
+                $where .= " AND (((`start` <= $starttime AND `end` > $starttime ) OR (`start` > $endtime AND `end` < $endtime)  OR (`start` > $starttime AND `end` > $starttime AND `start` <= $endtime AND `end` <= $endtime) OR (`start` > $starttime AND `end` > $starttime AND `start` < $endtime AND `end` > $endtime) OR (`start` = $starttime AND `end` = $endtime )) OR ( `start` <= $starttime AND `end` IS NULL))  ORDER by user_id ASC";
                 if ($id && is_numeric($id)) {
                     $where .= " AND `id` != $id";
                 }