From 502942deb3b7cca782d0865a2d0622b9a0bd0580 Mon Sep 17 00:00:00 2001 From: chfhtw Date: Mon, 4 Aug 2025 09:28:50 +0200 Subject: [PATCH 1/2] Remove template from slot --- public/js/components/Cis/LvPlan/LvPlan.js | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js index 2fbac0e3a..f7763c54b 100644 --- a/public/js/components/Cis/LvPlan/LvPlan.js +++ b/public/js/components/Cis/LvPlan/LvPlan.js @@ -124,25 +124,23 @@ export default { @update:range="updateRange" class="responsive-calendar" > - + ` }; From 89c64cadc7a28eaa63f4b5c7cc870d2dae86cda3 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Mon, 4 Aug 2025 10:20:11 +0200 Subject: [PATCH 2/2] calc current Studiensemester by start_date, to avoid gap and error msg during summer --- application/controllers/api/frontend/v1/LvPlan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php index a1d40cb81..6a1f9bf7f 100644 --- a/application/controllers/api/frontend/v1/LvPlan.php +++ b/application/controllers/api/frontend/v1/LvPlan.php @@ -115,7 +115,7 @@ class LvPlan extends FHCAPI_Controller $this->load->model('education/Studentlehrverband_model','StudentLehrverbandModel'); $this->load->model('organisation/Studiensemester_model','StudiensemesterModel'); - $current_Studiensemester = $this->StudiensemesterModel->getAkt(); + $current_Studiensemester = $this->StudiensemesterModel->getByDate($start_date); $current_Studiensemester = $this->getDataOrTerminateWithError($current_Studiensemester); $current_Studiensemester = current($current_Studiensemester)->studiensemester_kurzbz; $studiengang = $this->StudentLehrverbandModel->loadWhere(["student_uid"=>getAuthUID(),"studiensemester_kurzbz"=>$current_Studiensemester]);