From d3ceed32c68c92d66cb8005cb44591e20811a280 Mon Sep 17 00:00:00 2001 From: adisposkofh Date: Thu, 7 May 2026 15:15:50 +0200 Subject: [PATCH] compacting all events in mobile monthly lv plan --- application/controllers/api/frontend/v1/LvPlan.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php index 2e8ac52d4..69cbeca54 100644 --- a/application/controllers/api/frontend/v1/LvPlan.php +++ b/application/controllers/api/frontend/v1/LvPlan.php @@ -109,7 +109,7 @@ class LvPlan extends FHCAPI_Controller $lvplanEvents = $this->getDataOrTerminateWithError($result); // fetching moodle events - $moodleEvents = $uid ? [] : $this->fetchMoodleEvents($start_date, $end_date); + $moodleEvents = $this->fetchMoodleEvents($start_date, $end_date, $uid); // fetching ferien events $ferienEvents = $this->fetchFerienEvents($start_date, $end_date, $uid); @@ -406,7 +406,7 @@ class LvPlan extends FHCAPI_Controller */ public function compactibleEventTypes() { - $this->terminateWithSuccess(["lehreinheit", "reservierung"]); + $this->terminateWithSuccess(["lehreinheit", "reservierung", "ferien", "moodle"]); } /** @@ -416,7 +416,7 @@ class LvPlan extends FHCAPI_Controller * @param string $end_date * @return array */ - private function fetchMoodleEvents($start_date, $end_date) + private function fetchMoodleEvents($start_date, $end_date, $uid = null) { $this->load->config('calendar'); @@ -439,7 +439,7 @@ class LvPlan extends FHCAPI_Controller [ 'start_date' => $start->format('c'), 'end_date' => $end->format('c'), - 'username' => getAuthUID() + 'username' => $uid ?? getAuthUID() ] );