From 0480e1b59c56cdef0ac3f13d9018d7a14f9af19b Mon Sep 17 00:00:00 2001 From: Spitzer Daniel Date: Tue, 5 Mar 2024 10:09:49 +0100 Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update=20=20*=20Neue=20migratio?= =?UTF-8?q?n=20f=C3=BCr=20Homeoffice/Urlaubs=C3=A4nderungen=20=20*=20Soll?= =?UTF-8?q?=20zeiten=20nun=20vom=20Startdatum=20abh=C3=A4ngig=20=20*=20Neu?= =?UTF-8?q?e=20Summierung=20der=20Sollzeiten=20in=20der=20Personalverwaltu?= =?UTF-8?q?ng=20=20*=20Urlaubstage=20werden=20nun=20Tage=20statt=20Stunden?= =?UTF-8?q?=20angezeigt=20(in=20Buchungen=20und=20Auswertungen)=20=20*=20U?= =?UTF-8?q?rlaube=20werden=20nun=20bis=201.1.2024=20ber=C3=BCcksichtigt=20?= =?UTF-8?q?=20*=20Homeoffice=20Flag=20nun=20m=C3=B6glich=20=20*=20Abwesenh?= =?UTF-8?q?eitskalender=20Sichtbar=20f=C3=BCr=20alle=20=20*=20Neuer=20Buch?= =?UTF-8?q?ungszeitraum=20f=C3=BCr=20Urlaubsgutschrift/Urlaubsminderung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/Timerecording/TimerecordingModel.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/Timerecording/TimerecordingModel.php b/application/Timerecording/TimerecordingModel.php index ac35e39e9..202f7bf1c 100644 --- a/application/Timerecording/TimerecordingModel.php +++ b/application/Timerecording/TimerecordingModel.php @@ -173,10 +173,11 @@ 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"; if ($id && is_numeric($id)) { $where .= " AND `id` != $id"; } + $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"; + //var_dump($where);exit; } }