From 54bcf837812cf9e2d5a1a689ae989ba9e2fc8219 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 2 Oct 2023 11:06:34 +0200
Subject: [PATCH 1/2] s&d

---
 .../controllers/components/Antrag/Unterbrechung.php   |  2 +-
 application/libraries/AntragLib.php                   | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/application/controllers/components/Antrag/Unterbrechung.php b/application/controllers/components/Antrag/Unterbrechung.php
index 4d89a5cb6..33bd0035d 100644
--- a/application/controllers/components/Antrag/Unterbrechung.php
+++ b/application/controllers/components/Antrag/Unterbrechung.php
@@ -86,7 +86,7 @@ class Unterbrechung extends FHC_Controller
 
 		$data = getData($result);
 
-		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiengang_kz, $data->studiensemester_kurzbz, $data->semester);
+		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiensemester_kurzbz);
 
 		$this->outputJsonSuccess($data);
 	}
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 4d136fb2c..6cad6c2bf 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1421,17 +1421,12 @@ class AntragLib
 		return success($resultDetails);
 	}
 
-	public function getSemesterForUnterbrechung($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester)
+	public function getSemesterForUnterbrechung($studiensemester_kurzbz)
 	{
-		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		$semester = [];
 
-		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester);
-		if (!hasData($result))
-			return $semester;
-
 		$result = $this->_ci->StudiensemesterModel->getNextFrom($studiensemester_kurzbz);
 		if (!hasData($result))
 			return $semester;
@@ -1442,10 +1437,6 @@ class AntragLib
 			'wiedereinstieg' => [$nextSem]
 		];
 
-		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $nextSem->studiensemester_kurzbz, $ausbildungssemester+1);
-		if (!hasData($result))
-			return $semester;
-
 		$result = $this->_ci->StudiensemesterModel->getNextFrom($nextSem->studiensemester_kurzbz);
 		if (!hasData($result))
 			return $semester;

From ad191f3f9050754ecb28008b19236eecdd628e86 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 2 Oct 2023 11:06:53 +0200
Subject: [PATCH 2/2] Optische Verbesserungen select field

---
 .../components/Studierendenantrag/Form/Unterbrechung.js   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 14e57f797..2459dec17 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -277,11 +277,13 @@ export default {
 					<div v-if="data.studierendenantrag_id">
 						{{datumWsFormatted}}
 					</div>
-					<div v-else-if="stsem === null" class="form-control">
-						{{p.t('ui/select_studiensemester')}}
+					<div v-else-if="stsem === null">
+						<select class="form-select" disabled>
+							<option selected>{{p.t('ui/select_studiensemester')}}</option>
+						</select>
 					</div>
 					<div v-else>
-						<select v-model="currentWiedereinstieg" class="form-control">
+						<select v-model="currentWiedereinstieg" class="form-select">
 							<option v-for="sem in data.studiensemester[stsem].wiedereinstieg" :key="sem.studiensemester_kurzbz" :value="sem.start">
 								{{sem.studiensemester_kurzbz}}
 							</option>