From de012b290bf9423d4313c06e2d1c6af35207f9ee Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 13 Nov 2025 16:27:15 +0100
Subject: [PATCH] get semester & orgform from Verband to StudVw Main Component

---
 application/controllers/api/frontend/v1/stv/Verband.php | 1 +
 public/js/components/Stv/Studentenverwaltung.js         | 6 +++++-
 public/js/components/Stv/Studentenverwaltung/Verband.js | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 9fcd97c91..ecfb5425a 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -173,6 +173,7 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addOrder('semester');
 
 		if ($org_form !== null) {
+			$this->StudiengangModel->addSelect("v.orgform_kurzbz");
 			$this->StudiengangModel->db->group_start();
 			$this->StudiengangModel->db->where('v.semester', 0);
 			$this->StudiengangModel->db->or_where('v.orgform_kurzbz', $org_form);
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index a1e38875d..06bb07aec 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -123,6 +123,8 @@ export default {
 			studiengangKz: undefined,
 			studiengangKuerzel: '',
 			studiensemesterKurzbz: this.defaultSemester,
+			selected_semester: undefined,
+			selected_orgform: undefined,
 			lists: {
 				nations: [],
 				sprachen: [],
@@ -182,7 +184,7 @@ export default {
 				+ data.person_id
 				);
 		},
-		onSelectVerband( {link, studiengang_kz}) {
+		onSelectVerband({ link, studiengang_kz, semester, orgform_kurzbz }) {
 			let urlpath = String(link);
 			if (!urlpath.match(/\/prestudent/))
 			{
@@ -191,6 +193,8 @@ export default {
 			this.$refs.stvList.updateUrl(ApiStv.students.verband(urlpath));
 
 			this.studiengangKz = studiengang_kz;
+			this.selected_semester = semester;
+			this.selected_orgform = orgform_kurzbz;
 			const stg = this.lists.stgs.find((element) => {
 				return (element.studiengang_kz === this.studiengangKz);
 			});
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 52f1f6a68..7716d941e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -114,7 +114,7 @@ export default {
 		},
 		onSelectTreeNode(node) {
 			if (node.data.link)
-				this.$emit('selectVerband', {link: node.data.link, studiengang_kz: node.data.stg_kz});
+				this.$emit('selectVerband', {link: node.data.link, studiengang_kz: node.data.stg_kz, semester: node.data.semester, orgform_kurzbz: node.data.orgform_kurzbz});
 		},
 		mapResultToTreeData(el) {
 			const cp = {