From 6d23f2b9fac4b87bcc61cebd30751ad23b078904 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 2 Jul 2026 15:58:23 +0200
Subject: [PATCH] Add Einstiegssemester - calculate semester_berechnet also for
 Stati 'Aufgenommener','Bewerber','Wartender' - show Einstiegssemester in
 DetailHeader for 'Aufgenommener','Bewerber','Wartender' and 'Interessent'

---
 application/libraries/stv/StudentListLib.php         | 2 +-
 public/js/components/DetailHeader/DetailHeader.js    | 6 ++++++
 public/js/components/Stv/Studentenverwaltung/List.js | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/libraries/stv/StudentListLib.php b/application/libraries/stv/StudentListLib.php
index a00f92822..432b75bd4 100644
--- a/application/libraries/stv/StudentListLib.php
+++ b/application/libraries/stv/StudentListLib.php
@@ -72,7 +72,7 @@ class StudentListLib
 		$this->addSelect('pls.bestaetigtam AS status_bestaetigung');
 		$this->addSelect("
 			CASE
-				WHEN pls.status_kurzbz = 'Interessent'
+				WHEN pls.status_kurzbz IN ('Interessent','Aufgenommener','Bewerber','Wartender')
 				THEN pls.ausbildungssemester
 				ELSE s.semester
 			END AS semester_berechnet
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index c5b8c348d..e266b9d11 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -435,6 +435,12 @@ export default {
 							{{headerData[0].verband}}
 						<strong v-if="headerData[0].gruppe !== null && headerData[0].gruppe != ' '" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
 							{{headerData[0].gruppe}}
+						<strong v-if="headerData[0].status=='Interessent'
+							|| headerData[0].status=='Aufgenommener'
+							|| headerData[0].status=='Bewerber'
+							|| headerData[0].status=='Wartender'"
+							class="text-muted"> | Einstiegssemester {{headerData[0].semester_berechnet}}
+						</strong>
 					</template>
 					<template v-else>
 					<strong class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 0ee63ea28..56a6a5334 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -93,7 +93,7 @@ export default {
 						}
 					},
 					{title:"Geschlecht", field:"geschlecht", headerFilter: "list", headerFilterParams: {values:{'m':'männlich','w':'weiblich','x':'divers','u':'unbekannt'}, listOnEmpty:true, autocomplete:true}},
-					{title:"Sem.", field:"semester_berechnet", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Sem.", field:"semester_berechnet", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{title:"Verb.", field:"verband", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{title:"Grp.", field:"gruppe", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{title:"Studiengang", field:"studiengang", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},