From c6686f56f6d14de0981b0edae0a77592c2c47bcf Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 4 Dec 2025 10:35:43 +0100
Subject: [PATCH 1/2] make ZGV fields and bisMelden field editable - new
 Berechtigung student/editDokZgv - Berechtigungen student/editBakkZGV,
 student/editMakkZGV, student/editBismelden

---
 .../controllers/Studentenverwaltung.php       |  4 +++
 .../js/components/Stv/Studentenverwaltung.js  |  7 +++-
 .../Studentenverwaltung/Details/Prestudent.js | 32 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 2ce19c58a..3fba97e91 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -32,6 +32,10 @@ class Studentenverwaltung extends Auth_Controller
 				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
 				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht'),
 				'system/change_outputformat' => $this->permissionlib->getOE_isEntitledFor('system/change_outputformat'),
+				'student/editBakkZgv' => $this->permissionlib->isBerechtigt('student/editBakkZgv'),
+				'student/editMakkZgv' => $this->permissionlib->isBerechtigt('student/editMakkZgv'),
+				'student/editDokZgv' => $this->permissionlib->isBerechtigt('student/editDokZgv'),
+				'student/editBismelden' => $this->permissionlib->isBerechtigt('student/editBismelden')
 			],
 			'variables' => [
 				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 03f84f75e..8f5b72f82 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -84,7 +84,12 @@ export default {
 			configShowAufnahmegruppen: this.config.showAufnahmegruppen,
 			configAllowUebernahmePunkte: this.config.allowUebernahmePunkte,
 			configUseReihungstestPunkte: this.config.useReihungstestPunkte,
-			appConfig: Vue.computed(() => this.appconfig)
+			appConfig: Vue.computed(() => this.appconfig),
+			hasZGVBakkPermission: this.permissions['student/editBakkZgv'],
+			hasZGVMasterPermission: this.permissions['student/editMakkZgv'],
+			hasZGVDoctorPermission: this.permissions['student/editDokZgv'],
+			hasBismeldenPermission: this.permissions['student/editBismelden'],
+
 		}
 	},
 	data() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index dc645dadc..a48e286e3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -30,6 +30,22 @@ export default {
 			from: 'hasAdminPermission',
 			default: false
 		},
+		hasZGVBakkPermission: {
+			from: 'hasZGVBakkPermission',
+			default: false
+		},
+		hasZGVMasterPermission: {
+			from: 'hasZGVMasterPermission',
+			default: false
+		},
+		hasZGVDoctorPermission: {
+			from: 'hasZGVDoctorPermission',
+			default: false
+		},
+		hasBismeldenPermission: {
+			from: 'hasBismeldenPermission',
+			default: false
+		},
 		currentSemester: {
 			from: 'currentSemester',
 			required: true
@@ -273,6 +289,7 @@ export default {
 						dropdown
 						name="zgv_code"
 						@complete="filterZgvs"
+						:disabled="!hasZGVBakkPermission"
 						>
 							<template #option="slotProps">
 								<div
@@ -291,6 +308,7 @@ export default {
 						type="text"
 						v-model="data.zgvort"
 						name="zgvort"
+						:disabled="!hasZGVBakkPermission"
 						>
 					</form-input>	
 					<form-input
@@ -307,6 +325,7 @@ export default {
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
+						:disabled="!hasZGVBakkPermission"
 						>
 					</form-input>
 					<form-input
@@ -316,6 +335,7 @@ export default {
 						type="select"
 						v-model="data.zgvnation"
 						name="zgvnation"
+						:disabled="!hasZGVBakkPermission"
 						>
 						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
 						<option value="">&nbsp;</option>
@@ -336,6 +356,7 @@ export default {
 						dropdown
 						name="zgvmas_code"
 						@complete="filterMasterZgvs"
+						:disabled="!hasZGVMasterPermission"
 						>
 							<template #option="slotProps">
 								<div
@@ -354,6 +375,7 @@ export default {
 						type="text"
 						v-model="data.zgvmaort"
 						name="zgvmaort"
+						:disabled="!hasZGVMasterPermission"
 						>
 					</form-input>
 					<form-input
@@ -370,6 +392,7 @@ export default {
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
+						:disabled="!hasZGVMasterPermission"
 						>
 					</form-input>
 					<form-input
@@ -379,6 +402,7 @@ export default {
 						type="select"
 						v-model="data.zgvmanation"
 						name="zgvmanation"
+						:disabled="!hasZGVMasterPermission"
 						>
 						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
 						<option value="">&nbsp;</option>
@@ -400,6 +424,7 @@ export default {
 						dropdown
 						name="zgvdoktor_code"
 						@complete="filterDoktorZgvs"
+						:disabled="!hasZGVDoctorPermission"
 						>
 							<template #option="slotProps">
 								<div
@@ -418,6 +443,7 @@ export default {
 						type="text"
 						v-model="data.zgvdoktorort"
 						name="zgvdoktorort"
+						:disabled="!hasZGVDoctorPermission"
 						>
 					</form-input>
 					<form-input
@@ -434,6 +460,7 @@ export default {
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
+						:disabled="!hasZGVDoctorPermission"
 						>
 					</form-input>
 					<form-input
@@ -443,6 +470,7 @@ export default {
 						type="select"
 						v-model="data.zgvdoktornation"
 						name="zgvdoktornation"
+						:disabled="!hasZGVDoctorPermission"
 						>
 						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
 						<option value="">&nbsp;</option>
@@ -459,6 +487,7 @@ export default {
 							type="checkbox"
 							v-model="data.zgv_erfuellt"
 							name="zgv_erfuellt"
+							:disabled="!hasZGVBakkPermission"
 							>
 						</form-input>
 					</div>
@@ -470,6 +499,7 @@ export default {
 							type="checkbox"
 							v-model="data.zgvmas_erfuellt"
 							name="zgvmas_erfuellt"
+							:disabled="!hasZGVMasterPermission"
 							>
 						</form-input>
 					</div>
@@ -481,6 +511,7 @@ export default {
 							type="checkbox"
 							v-model="data.zgvdoktor_erfuellt"
 							name="zgvdoktor_erfuellt"
+							:disabled="!hasZGVDoctorPermission"
 							>
 						</form-input>
 					</div>
@@ -601,6 +632,7 @@ export default {
 							type="checkbox"
 							v-model="data.bismelden"
 							name="bismelden"
+							:disabled="!hasBismeldenPermission"
 							>
 						</form-input>
 					</div>

From 2bb58e24cc7b91a344d1e2a4eab19f5561c9430d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 10 Dec 2025 15:18:16 +0100
Subject: [PATCH 2/2] fix timing to prevent zgv autocomplete fields from being
 empty when switching from and to prestudent tab

---
 .../Stv/Studentenverwaltung/Details/Prestudent.js           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index a48e286e3..7a3f7f44e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -122,7 +122,7 @@ export default {
 	},
 
 	methods: {
-		loadPrestudent() {
+		async loadPrestudent() {
 			return this.$api
 				.call(ApiStvPrestudent.get(this.modelValue.prestudent_id, this.currentSemester))
 				.then(result => result.data)
@@ -170,8 +170,8 @@ export default {
 			)
 		},
 	},
-	created() {
-		this.loadPrestudent();
+	async created() {
+		await this.loadPrestudent();
 		this.$api
 			.call(ApiStvPrestudent.getBezeichnungZGV())
 			.then(result => result.data)