From d0d42a6a15484c4896e66994c7b96f0c80e910bb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 4 Aug 2023 14:11:03 +0200
Subject: [PATCH] Unterbrecher - Wiedereintrittssemester Dropdown

---
 application/libraries/AntragLib.php           | 22 ++++++++++++++-----
 .../Studierendenantrag/Form/Unterbrechung.js  | 12 +++++++---
 system/phrasesupdate.php                      |  4 ++--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 0b5ec1957..97617231d 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1341,9 +1341,9 @@ class AntragLib
 			return $semester;
 		$nextSem = current(getData($result));
 
-		$semester[] = [
+		$semester[0] = [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'wiedereinstieg' => $nextSem->start
+			'wiedereinstieg' => [$nextSem]
 		];
 
 		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $nextSem->studiensemester_kurzbz, $ausbildungssemester+1);
@@ -1354,13 +1354,25 @@ class AntragLib
 		if (!hasData($result))
 			return $semester;
 
-		$semAfterNext = current(getData($result));
+		$currSemester = current(getData($result));
+		$followingSemester = [$currSemester];
 
-		$semester[] = [
+		for ($i = 0; $i < 3; $i++) {
+			$result = $this->_ci->StudiensemesterModel->getNextFrom($currSemester->studiensemester_kurzbz);
+			if (!hasData($result))
+				break;
+			$currSemester = current(getData($result));
+			$followingSemester[] = $currSemester;
+		}
+
+		$semester[1] = [
 			'studiensemester_kurzbz' => $nextSem->studiensemester_kurzbz,
-			'wiedereinstieg' => $semAfterNext->start
+			'wiedereinstieg' => $followingSemester
 		];
 
+		foreach ($followingSemester as $sem)
+			$semester[0]['wiedereinstieg'][] = $sem;
+
 		return $semester;
 	}
 
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 3f2836a42..e0b64e7cb 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -31,6 +31,7 @@ export default {
 				default: []
 			},
 			stsem: null,
+			currentWiedereinstieg: '',
 			siteUrl: FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router
 		}
@@ -101,7 +102,7 @@ export default {
 			formData.append("studiensemester", this.stsem !== null && this.data.studiensemester[this.stsem].studiensemester_kurzbz);
 			formData.append("prestudent_id", this.data.prestudent_id);
 			formData.append("grund", this.$refs.grund.value);
-			formData.append("datum_wiedereinstieg", this.stsem !== null && this.data.studiensemester[this.stsem].wiedereinstieg);
+			formData.append("datum_wiedereinstieg", this.stsem !== null && this.currentWiedereinstieg);
 
 			axios.post(
 				FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -257,6 +258,7 @@ export default {
 							v-model="stsem"
 							required
 							:id="'studierendenantrag-form-abmeldung-' + uuid + '-stsem'"
+							@input="currentWiedereinstieg = ''"
 							>
 							<option v-for="(stsem, index) in data.studiensemester" :key="index" :value="index">
 								{{stsem.studiensemester_kurzbz}}
@@ -278,8 +280,12 @@ export default {
 					<div v-else-if="stsem === null" class="form-control">
 						{{p.t('ui/select_studiensemester')}}
 					</div>
-					<div v-else class="form-control">
-						{{datumWsFormatted}}
+					<div v-else>
+						<select v-model="currentWiedereinstieg" class="form-control">
+							<option v-for="sem in data.studiensemester[stsem].wiedereinstieg" :key="sem.studiensemester_kurzbz" :value="sem.start">
+								{{sem.studiensemester_kurzbz}}
+							</option>
+						</select>
 					</div>
 
 					<div v-if="errors.datum_wiedereinstieg.length" class="invalid-feedback d-block">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c616c8365..babfbac70 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18773,13 +18773,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Datum Wiedereinstieg',
+				'text' => 'Wiedereinstieg',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Date of return',
+				'text' => 'Re-Entry',
 				'description' => '',
 				'insertvon' => 'system'
 			)