From 98c5cf86beff5bb9210875c1029812350afaab3f Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Tue, 28 Sep 2021 19:17:53 +0200 Subject: [PATCH] bug fixing --- customerapi/controllers/EventController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/customerapi/controllers/EventController.php b/customerapi/controllers/EventController.php index a6962a7..21dc855 100644 --- a/customerapi/controllers/EventController.php +++ b/customerapi/controllers/EventController.php @@ -117,13 +117,18 @@ class EventController extends CustomerApiController */ private function buildEventQuery($query, $interval) { + + $paramEventStartMax = (clone $interval->lastActiveDate); + $paramEventStartMax = $paramEventStartMax->modify('+1 day'); + $paramEventStartMax = $paramEventStartMax->getTimestamp(); + return $query ->innerJoinWith('trainer') ->innerJoinWith('eventType') ->innerJoinWith('room') ->joinWith('activeEventRegistrations','event.id = activeEventRegistrations.id_event') ->andWhere(['>=', 'event.start', $interval->firstActiveDate->getTimestamp()]) - ->andWhere(['<', 'event.start', (clone $interval->lastActiveDate)->modify('+1 day')->getTimestamp()]) + ->andWhere(['<', 'event.start', $paramEventStartMax]) ->andWhere(['event.active' => '1']); }