From cfb0efff629d5a3371f0ae05885bc28c0c2622f3 Mon Sep 17 00:00:00 2001 From: Spitzer Daniel Date: Thu, 29 Feb 2024 10:01:39 +0100 Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update=20*=20Check=20der=20vorh?= =?UTF-8?q?andenen=20Buchungen=20ge=C3=A4ndert.=20=20*=20Exakte=20=C3=BCbe?= =?UTF-8?q?rschneidungen=20von=20Start=20und=20Endzeit=20k=C3=B6nnen=20nun?= =?UTF-8?q?=20verbucht=20werden=20und=20muss=20nicht=20die=201=20Minute=20?= =?UTF-8?q?differenz=20haben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/Timerecording/TimerecordingModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Timerecording/TimerecordingModel.php b/application/Timerecording/TimerecordingModel.php index 7b83a7a1e..cfd5833e7 100644 --- a/application/Timerecording/TimerecordingModel.php +++ b/application/Timerecording/TimerecordingModel.php @@ -164,7 +164,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` 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"; }