From ab7a5bac68a970a1232c86ea0941127b6a10fb6f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 13 Mar 2024 08:37:40 +0100
Subject: [PATCH] Unterbrechung studienjahr und semester anzeige

---
 application/libraries/AntragLib.php                |  1 +
 .../models/education/Studierendenantrag_model.php  |  3 ++-
 .../Studierendenantrag/Form/Unterbrechung.js       | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 6896c46f9..03a45e5e6 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1688,6 +1688,7 @@ class AntragLib
 		return array_reduce($result, function ($carry, $item) {
 			if (!isset($carry[$item->von]))
 				$carry[$item->von] = [
+					'studienjahr_kurzbz' => $item->studienjahr_kurzbz,
 					'studiensemester_kurzbz' => $item->von,
 					'wiedereinstieg' => [],
 					'disabled' => true
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 62950c1e8..b7cda4274 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -383,6 +383,7 @@ class Studierendenantrag_model extends DB_Model
 
 		$sql = "WITH numbered_sems AS (
 		    SELECT
+		        a.studienjahr_kurzbz AS studienjahr_kurzbz,
 		        a.studiensemester_kurzbz AS von,
 		        b.studiensemester_kurzbz AS bis,
 		        a.start AS start,
@@ -399,7 +400,7 @@ class Studierendenantrag_model extends DB_Model
 		    FROM numbered_sems 
 		    WHERE numbered_sems.row_number <= ?
 		)
-		SELECT s.von, s.bis, s.start, s.ende, studierendenantrag_id
+		SELECT s.von, s.bis, s.start, s.ende, studierendenantrag_id, studienjahr_kurzbz
 		FROM last_sems s
 		LEFT JOIN (
 			SELECT studierendenantrag_id, start, datum_wiedereinstieg AS ende 
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 31f630add..a2058b5bf 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -65,6 +65,18 @@ export default {
 				return datumUnformatted;
 			let datum = new Date(datumUnformatted);
 			return datum.toLocaleDateString();
+		},
+		semesterOffsets() {
+			if (!this.data || !this.data.studiensemester)
+				return [];
+			return Object.values(this.data.studiensemester)
+				.filter(el => !el.disabled)
+				.map(el => el.studiensemester_kurzbz);
+		},
+		semester() {
+			if (!this.stsem)
+				return '';
+			return this.data.semester + this.semesterOffsets.indexOf(this.stsem);
 		}
 	},
 	methods: {
@@ -242,7 +254,7 @@ export default {
 						<tr>
 							<th>{{$p.t('lehre', 'semester')}}</th>
 							<td align="right" v-if="data.studierendenantrag_id">{{data.semester}}</td>
-							<td align="right" v-else>{{stsem === null ? '' : data.studiensemester[stsem].semester}}</td>
+							<td align="right" v-else>{{semester}}</td>
 						</tr>
 					</table>
 				</div>