From 405062f5493fcdaaf3ed0e9b501a08e5aa93f081 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 7 May 2025 18:36:51 +0200
Subject: [PATCH 001/101] added Projektarbeit tab to Studierendenverwaltung,
 adding, editing, deleting of Projektarbeiten now possible

---
 .../api/frontend/v1/stv/Config.php            |   5 +
 .../api/frontend/v1/stv/Projektarbeit.php     | 334 +++++++
 .../education/Lehrveranstaltung_model.php     |  57 ++
 .../models/education/Projektarbeit_model.php  |  34 +-
 application/models/ressource/Firma_model.php  |  21 +-
 public/js/api/factory/stv/projektarbeit.js    |  80 ++
 .../Details/Projektarbeit.js                  |  24 +
 .../Details/Projektarbeit/Betreuung.js        | 847 ++++++++++++++++++
 .../Details/Projektarbeit/Details.js          | 461 ++++++++++
 .../Details/Projektarbeit/Projektarbeit.js    | 377 ++++++++
 10 files changed, 2230 insertions(+), 10 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Projektarbeit.php
 create mode 100644 public/js/api/factory/stv/projektarbeit.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Betreuung.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 455b1e8fc..dd2eaed02 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -123,6 +123,11 @@ class Config extends FHCAPI_Controller
 			'config' => $config['finalexam']
 		];
 
+		$result['projektarbeit'] = [
+			'title' => $this->p->t('stv', 'tab_projektarbeit'),
+			'component' => './Stv/Studentenverwaltung/Details/Projektarbeit.js'
+		];
+
 		$result['mobility'] = [
 			'title' => $this->p->t('stv', 'tab_mobility'),
 			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
new file mode 100644
index 000000000..3be2b26a3
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -0,0 +1,334 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Projektarbeit extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getProjektarbeit' => ['admin:r', 'assistenz:r'],
+			'loadProjektarbeit' => ['admin:r', 'assistenz:r'],
+			'insertProjektarbeit' => ['admin:rw', 'assistenz:rw'],
+			'updateProjektarbeit' => ['admin:rw', 'assistenz:rw'],
+			'deleteProjektarbeit' => ['admin:rw', 'assistenz:rw'],
+			'getTypenProjektarbeit' => ['admin:r', 'assistenz:r'],
+			'getFirmen' => ['admin:r', 'assistenz:r'],
+			'getLehrveranstaltungen' => ['admin:r', 'assistenz:r'],
+			'getNoten' => ['admin:rw', 'assistenz:rw']
+		]);
+
+		// Load Libraries
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'person',
+			'projektarbeit'
+		]);
+
+		// Load models
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$this->load->model('education/Projekttyp_model', 'ProjekttypModel');
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$this->load->model('ressource/Firma_model', 'FirmaModel');
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('education/Note_model', 'NoteModel');
+		$this->load->model('education/Projektbetreuer_model', 'BetreuerModel');
+
+		// load libraries
+		$this->load->library('PermissionLib');
+	}
+
+	public function getProjektarbeit()
+	{
+		$student_uid = $this->input->get('uid');
+
+		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->ProjektarbeitModel->getProjektarbeit($student_uid);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$projektarbeiten = getData($result);
+
+		foreach ($projektarbeiten as $projektarbeit)
+		{
+			$projektarbeit_id = $projektarbeit->projektarbeit_id;
+			$abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
+
+			if (isError($abgabeRes)) $this->terminateWithError(getError($abgabeRes), self::ERROR_TYPE_GENERAL);
+
+			if (hasData($abgabeRes))
+			{
+				$paabgabe = getData($abgabeRes)[0];
+				$projektarbeit->abgabedatum = $paabgabe->abgabedatum;
+			}
+		}
+
+		$this->terminateWithSuccess($projektarbeiten);
+	}
+
+	public function loadProjektarbeit()
+	{
+		$projektarbeit_id = $this->input->get('projektarbeit_id');
+
+		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
+
+		$this->ProjektarbeitModel->addSelect(
+			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, firma_id,
+			lehrveranstaltung_id, lehreinheit_id, beginn, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
+		);
+		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id');
+		$result = $this->ProjektarbeitModel->loadWhere(
+			array('projektarbeit_id' => $projektarbeit_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function insertProjektarbeit()
+	{
+		$student_uid = $this->input->post('uid');
+
+		if (!$student_uid) return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+
+		if (!$this->_hasBerechtigungForStudent($student_uid))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$formData = $this->input->post('formData');
+
+		$this->addMeta('form', $formData);
+
+		if ($this->_validate($formData) == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->ProjektarbeitModel->insert(
+			array_merge($formData, ['insertamum' => date('c'), 'insertvon' => getAuthUID(), 'student_uid' => $student_uid])
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function updateProjektarbeit()
+	{
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+
+		if (!$projektarbeit_id || !is_numeric($projektarbeit_id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$formData = $this->input->post('formData');
+
+		if ($this->_validate($formData) == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->ProjektarbeitModel->update(
+			$projektarbeit_id,
+			array_merge($formData, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteProjektarbeit()
+	{
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+
+		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID'], self::ERROR_TYPE_GENERAL));
+
+		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$validate = $this->_validateDelete($projektarbeit_id);
+
+		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->ProjektarbeitModel->delete(
+			array('projektarbeit_id' => $projektarbeit_id)
+		);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result))
+		{
+			$this->outputJson($result);
+		}
+
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+	public function getTypenProjektarbeit()
+	{
+		$result = $this->ProjekttypModel->loadWhere(['aktiv' => true]);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	public function getFirmen()
+	{
+		$searchString = $this->input->get('searchString');
+
+		if (!isset($searchString)) $this->terminateWithError($this->p->t('projektarbeit', 'error_searchStringMissing', self::ERROR_TYPE_GENERAL));
+
+		$result = $this->FirmaModel->searchFirmen($searchString, $aktiv = true);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	public function getLehrveranstaltungen()
+	{
+		$student_uid = $this->input->get('student_uid');
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+		$additional_lehrveranstaltung_id = $this->input->get('additional_lehrveranstaltung_id');
+
+		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemster missing', self::ERROR_TYPE_GENERAL);
+
+		$lvsResult = $this->LehrveranstaltungModel->getLvsForProjektarbeit($student_uid, $studiengang_kz, $additional_lehrveranstaltung_id);
+
+		if (isError($lvsResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
+
+		$lvs = hasData($lvsResult) ? getData($lvsResult) : [];
+
+		foreach ($lvs as $lv)
+		{
+			$lehreinheiten = $this->LehreinheitModel->getLesForLv(
+				$lv->lehrveranstaltung_id, $studiensemester_kurzbz
+			);
+
+			foreach ($lehreinheiten as $lehreinheit)
+			{
+				if (!isEmptyArray($lehreinheit->lektoren))
+				{
+					$this->MitarbeiterModel->addSelect('kurzbz');
+					$this->MitarbeiterModel->db->where_in('tbl_mitarbeiter.mitarbeiter_uid', $lehreinheit->lektoren);
+					$maResult = $this->MitarbeiterModel->load();
+
+					if (isError($maResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
+
+					$lehreinheit->lektoren = array_column(getData($maResult), 'kurzbz');
+				}
+			}
+
+			$lv->lehreinheiten = $lehreinheiten;
+		}
+
+		return $this->terminateWithSuccess($lvs);
+	}
+
+	public function getNoten()
+	{
+		$result = $this->NoteModel->load();
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	/**
+	 *
+	 * @param
+	 * @return object success or error
+	 */
+	private function _validate($formData)
+	{
+		$this->form_validation->set_data($formData);
+
+		$this->form_validation->set_rules('titel', 'Titel', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+		]);
+
+		$this->form_validation->set_rules('projekttyp_kurzbz', 'Projekttyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
+		]);
+
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
+			//'matches' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
+			'numeric' =>  $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
+		]);
+
+		$this->form_validation->set_rules('beginn', 'Beginn', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Beginn'])
+		]);
+
+		return $this->form_validation->run();
+	}
+
+	/**
+	 *
+	 * @param
+	 * @return object success or error
+	 */
+	private function _validateDelete($projektarbeit_id)
+	{
+		$this->BetreuerModel->addSelect('1');
+		$result = $this->BetreuerModel->loadWhere(['projektarbeit_id' => $projektarbeit_id]);
+
+		if (isError($result)) return $result;
+
+		if (hasData($result)) return error($this->p->t('projektarbeit', 'error_betreuerNichtGeloescht'));
+
+		$this->PaabgabeModel->addSelect('1');
+		$result = $this->PaabgabeModel->loadWhere(['projektarbeit_id' => $projektarbeit_id]);
+
+		if (isError($result)) return $result;
+
+		if (hasData($result)) return error($this->p->t('projektarbeit', 'error_paabgabeNichtGeloescht'));
+
+		return success();
+	}
+
+	private function _hasBerechtigungForStudent($student_uid)
+	{
+		if (!$student_uid)
+			return false;
+
+		$this->load->model('crm/Student_model', 'StudentModel');
+
+		$this->StudentModel->addSelect('studiengang_kz');
+		$result = $this->StudentModel->load([$student_uid]);
+		if (isError($result) || !hasData($result))
+			return false;
+
+		$studiengang_kz = getData($result)[0]->studiengang_kz;
+
+		if ($this->permissionlib->isBerechtigt('admin', 'suid', $studiengang_kz))
+			return true;
+		if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $studiengang_kz))
+			return true;
+
+		return false;
+	}
+}
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 056fb45d7..446e6e9cf 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -988,4 +988,61 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	/**
+	 * Gets Lehrveranstaltungen for a student, as needed for a Projektarbeit.
+	 * @param student_uid
+	 * @param studiengang_kz optional, all Lvs of this Studiengang will be included 
+	 * @param additional_lehrveranstaltung_id optional, this lv will be added to result
+	 * @return object success or error
+	 */
+	public function getLvsForProjektarbeit($student_uid, $studiengang_kz = null, $additional_lehrveranstaltung_id = null)
+	{
+		$params = array($student_uid, $student_uid);
+
+		$qry = "
+			SELECT *
+			FROM
+				lehre.tbl_lehrveranstaltung
+			WHERE
+				(
+					lehrveranstaltung_id IN (
+
+						SELECT
+							lehrveranstaltung_id
+						FROM
+							campus.vw_student_lehrveranstaltung
+						WHERE
+							uid=?
+
+						UNION
+
+						SELECT
+							lehrveranstaltung_id
+						FROM
+							lehre.tbl_zeugnisnote
+						WHERE
+							student_uid=?
+					)";
+
+		if (isset($studiengang_kz))
+		{
+			$params[] = $studiengang_kz;
+			$qry .= " OR (studiengang_kz = ? AND semester IS NOT NULL)";
+		}
+
+		if (isset($additional_lehrveranstaltung_id))
+		{
+			$params[] = $additional_lehrveranstaltung_id;
+			$qry .= " OR lehrveranstaltung_id = ?";
+		}
+
+		$qry .= "
+				)
+				AND projektarbeit = TRUE
+			ORDER BY
+				semester, bezeichnung";
+
+		return $this->execQuery($qry, $params);
+	}
 }
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 109e23373..2be79f8e9 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -24,15 +24,17 @@ class Projektarbeit_model extends DB_Model
 	public function getProjektarbeit($student_uid, $studiengang_kz = null, $studiensemester_kurzbz = null, $projekttyp = null, $final = null)
 	{
 		$qry = "SELECT
-					tbl_projektarbeit.* , tbl_projekttyp.bezeichnung
+					tbl_projektarbeit.*, tbl_projekttyp.bezeichnung,
+					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
+					tbl_firma.name AS firma_name
 				FROM
 					lehre.tbl_projektarbeit
 				JOIN
-					lehre.tbl_projekttyp USING (projekttyp_kurzbz), lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung
-
+					lehre.tbl_projekttyp USING (projekttyp_kurzbz), lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, public.tbl_firma
 				WHERE
 					tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
 					tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
+					tbl_projektarbeit.firma_id = tbl_firma.firma_id AND
 					tbl_projektarbeit.student_uid = ?";
 
 		$params = array($student_uid);
@@ -69,4 +71,30 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	/**
+	 *
+	 * @param
+	 * @return object success or error
+	 */
+	public function hasBerechtigungForProjektarbeit($projektarbeit_id)
+	{
+		if (!$projektarbeit_id || !is_numeric($projektarbeit_id))
+			return false;
+
+		$this->ProjektarbeitModel->addSelect('studiengang_kz');
+		$this->ProjektarbeitModel->addJoin('public.tbl_student', 'student_uid');
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		if (isError($result) || !hasData($result))
+			return false;
+
+		$studiengang_kz = getData($result)[0]->studiengang_kz;
+
+		if ($this->permissionlib->isBerechtigt('admin', 'suid', $studiengang_kz))
+			return true;
+		if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $studiengang_kz))
+			return true;
+
+		return false;
+	}
 }
diff --git a/application/models/ressource/Firma_model.php b/application/models/ressource/Firma_model.php
index 431f0815f..5ae53eeaf 100644
--- a/application/models/ressource/Firma_model.php
+++ b/application/models/ressource/Firma_model.php
@@ -12,17 +12,24 @@ class Firma_model extends DB_Model
 		$this->pk = 'firma_id';
 	}
 
-	public function searchFirmen($filter)
+	public function searchFirmen($filter, $aktiv = null)
 	{
+		$params = [];
 		$filter = strtoLower($filter);
 		$qry = "
-			SELECT 
+			SELECT
 				f.name, f.firma_id
-			FROM 
-			    public.tbl_firma f
-			WHERE 
-			    lower (f.name) LIKE '%". $this->db->escape_like_str($filter)."%'";
+			FROM
+				public.tbl_firma f
+			WHERE
+				lower (f.name) LIKE '%". $this->db->escape_like_str($filter)."%'";
 
-		return $this->execQuery($qry);
+			if (isset($aktiv) && is_bool($aktiv))
+			{
+				$params[] = $aktiv;
+				$qry .= " AND aktiv = ?";
+			}
+
+		return $this->execQuery($qry, $params);
 	}
 }
diff --git a/public/js/api/factory/stv/projektarbeit.js b/public/js/api/factory/stv/projektarbeit.js
new file mode 100644
index 000000000..243383de0
--- /dev/null
+++ b/public/js/api/factory/stv/projektarbeit.js
@@ -0,0 +1,80 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getProjektarbeit(uid) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektarbeit/getProjektarbeit',
+			params: { uid }
+		};
+	},
+	getTypenProjektarbeit() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektarbeit/getTypenProjektarbeit'
+		};
+	},
+	getFirmen(searchString) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektarbeit/getFirmen',
+			params: {searchString}
+		};
+	},
+	getLehrveranstaltungen(student_uid, studiengang_kz, studiensemester_kurzbz, additional_lehrveranstaltung_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektarbeit/getLehrveranstaltungen',
+			params: { student_uid, studiengang_kz, studiensemester_kurzbz, additional_lehrveranstaltung_id }
+		};
+	},
+	getNoten() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektarbeit/getNoten'
+		};
+	},
+	loadProjektarbeit(projektarbeit_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektarbeit/loadProjektarbeit',
+			params: { projektarbeit_id }
+		};
+	},
+	addNewProjektarbeit(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/projektarbeit/insertProjektarbeit',
+			params
+		};
+	},
+	updateProjektarbeit(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/projektarbeit/updateProjektarbeit',
+			params
+		};
+	},
+	deleteProjektarbeit(projektarbeit_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/projektarbeit/deleteProjektarbeit',
+			params: { projektarbeit_id }
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit.js
new file mode 100644
index 000000000..3615e8f5d
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit.js
@@ -0,0 +1,24 @@
+import Projektarbeit from './Projektarbeit/Projektarbeit.js';
+
+export default {
+	name: "TabProjektarbeit",
+	components: {
+		Projektarbeit
+	},
+	provide() {
+		return {
+			config: this.config
+		};
+	},
+	props: {
+		modelValue: Object,
+		config: Object
+	},
+	data(){
+		return {}
+	},
+	template: `
+	<div class="stv-details-projektarbeit h-100 d-flex flex-column">
+		<projektarbeit ref="projektarbeit" :student="modelValue"></projektarbeit>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Betreuung.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Betreuung.js
new file mode 100644
index 000000000..5d223d694
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Betreuung.js
@@ -0,0 +1,847 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
+import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+
+import ApiStvAbschlusspruefung from '../../../../../api/factory/stv/abschlusspruefung.js';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		FormForm,
+		FormInput,
+		PvAutoComplete,
+		AbschlusspruefungDropdown,
+		PruefungList
+	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+		config: {
+			from: 'config',
+			required: true
+		},
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		},
+		isBerechtigtDocAndOdt: {
+			from: 'hasPermissionOutputformat',
+			default: false
+		}
+	},
+	computed: {
+		studentUids() {
+			if (this.student.uid)
+			{
+				return [this.student.uid];
+			}
+			return this.student.map(e => e.uid);
+		},
+		studentKzs(){
+			if (this.student.uid)
+			{
+				return [this.student.studiengang_kz];
+			}
+			return this.student.map(e => e.studiengang_kz);
+		},
+		stg_kz(){
+			return this.studentKzs[0];
+		},
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(ApiStvAbschlusspruefung.getAbschlusspruefung(this.student.uid)),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "vorsitz", field: "vorsitz_nachname"},
+					{title: "abschlussbeurteilung", field: "beurteilung_bezeichnung"},
+					{title: "prueferIn1", field: "p1_nachname", visible: false},
+					{title: "prueferIn2", field: "p2_nachname", visible: false},
+					{title: "prueferIn3", field: "p3_nachname", visible: false},
+					{
+						title: "datum", 
+						field: "datum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}
+					},
+					{title: "uhrzeit", field: "uhrzeit"},
+					{
+						title: "freigabe", 
+						field: "freigabedatum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}
+					},
+					{title: "pruefungsantritt", field: "antritt_bezeichnung"},
+					{
+						title: "sponsion", 
+						field: "sponsion",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}
+					},
+					{title: "anmerkung", field: "anmerkung"},
+					{title: "abschlusspruefung_id", field: "abschlusspruefung_id", visible: false},
+					{title: "typ", field: "pruefungstyp_kurzbz", visible: false},
+
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = this.$p.t('ui', 'bearbeiten');
+							button.addEventListener('click', (event) =>
+								this.actionEditAbschlusspruefung(cell.getData().abschlusspruefung_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = this.$p.t('ui', 'loeschen');
+							button.addEventListener('click', () =>
+								this.actionDeleteAbschlusspruefung(cell.getData().abschlusspruefung_id)
+							);
+							container.append(button);
+
+							container.append(cell.getData().actionDiv);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				minHeight: '200',
+				selectable: true,
+				index: 'abschlusspruefung_id',
+				persistenceID: 'stv-details-finalexam'
+			},
+			tabulatorEvents: [
+				{
+					event: 'dataLoaded',
+					handler: data => this.tabulatorData = data.map(item => {
+						item.actionDiv = document.createElement('div');
+						return item;
+					}),
+				},
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'person', 'stv', 'abschlusspruefung', 'ui']);
+
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('vorsitz_nachname').component.updateDefinition({
+							title: this.$p.t('abschlusspruefung', 'vorsitz_header')
+						});
+						cm.getColumnByField('beurteilung_bezeichnung').component.updateDefinition({
+							title: this.$p.t('abschlusspruefung', 'abschlussbeurteilung')
+						});
+						cm.getColumnByField('p1_nachname').component.updateDefinition({
+							title: this.$p.t('abschlusspruefung', 'pruefer1')
+						});
+						cm.getColumnByField('p2_nachname').component.updateDefinition({
+							title: this.$p.t('abschlusspruefung', 'pruefer2')
+						});
+						cm.getColumnByField('p3_nachname').component.updateDefinition({
+							title: this.$p.t('abschlusspruefung', 'pruefer3')
+						});
+						cm.getColumnByField('datum').component.updateDefinition({
+							title: this.$p.t('global', 'datum')
+						});
+						cm.getColumnByField('uhrzeit').component.updateDefinition({
+							title: this.$p.t('global', 'uhrzeit')
+						});
+						cm.getColumnByField('freigabedatum').component.updateDefinition({
+							title: this.$p.t('abschlusspruefung', 'freigabe')
+						});
+						cm.getColumnByField('antritt_bezeichnung').component.updateDefinition({
+							title: this.$p.t('abschlusspruefung', 'pruefungsantritt')
+						});
+						cm.getColumnByField('sponsion').component.updateDefinition({
+							title: this.$p.t('abschlusspruefung', 'sponsion')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('pruefungstyp_kurzbz').component.updateDefinition({
+							title: this.$p.t('global', 'typ')
+						});
+						cm.getColumnByField('abschlusspruefung_id').component.updateDefinition({
+							title: this.$p.t('ui', 'abschlusspruefung_id')
+						});
+						/*
+						cm.getColumnByField('actions').component.updateDefinition({
+						title: this.$p.t('global', 'aktionen')
+												});
+						*/
+					}
+				}
+			],
+			tabulatorData: [],
+			lastSelected: null,
+			formData: {
+				typStg: null,
+				pruefungstyp_kurzbz: null,
+				akadgrad_id: null,
+				vorsitz: null,
+				pruefungsantritt_kurzbz: null,
+				abschlussbeurteilung_kurzbz: null,
+				datum: null,
+				sponsion: null,
+				pruefer1: null,
+				pruefer2: null,
+				pruefer3: null,
+				anmerkung: null,
+				protokoll: null,
+				note: null,
+				link: null
+			},
+			statusNew: true,
+			arrTypen: [],
+			arrAntritte: [],
+			arrBeurteilungen: [],
+			arrAkadGrad: [],
+			arrNoten: [],
+			filteredMitarbeiter: [],
+			filteredPruefer: [],
+			abortController: {
+				mitarbeiter: null,
+				pruefer: null
+			},
+			stgInfo: { typ: '', oe_kurzbz: '' }
+		}
+	},
+	watch: {
+		student(){
+			if (this.$refs.table) {
+				this.$refs.table.reloadTable();
+			}
+			this.getStudiengangByKz();
+		}
+	},
+	methods: {
+		getStudiengangByKz(){
+			this.stgInfo = { typ: '', oe_kurzbz: '' };
+			this.$api
+				.call(ApiStudiengang.getStudiengangByKz(this.stg_kz))
+				.then(result => this.stgInfo = result.data)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		actionNewAbschlusspruefung() {
+			this.resetForm();
+			this.statusNew = true;
+			this.$refs.finalexamModal.show();
+			this.setDefaultFormData();
+		},
+		actionEditAbschlusspruefung(abschlusspruefung_id) {
+			this.resetForm();
+			this.statusNew = false;
+			this.$refs.finalexamModal.show();
+			this.loadAbschlusspruefung(abschlusspruefung_id);
+		},
+		actionDeleteAbschlusspruefung(abschlusspruefung_id) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? abschlusspruefung_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteAbschlusspruefung)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		addNewAbschlusspruefung() {
+			const dataToSend = {
+				uid: this.student.uid,
+				formData: this.formData
+			};
+
+			return this.$refs.formFinalExam
+				.call(ApiStvAbschlusspruefung.addNewAbschlusspruefung(dataToSend))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('finalexamModal');
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		loadAbschlusspruefung(abschlusspruefung_id) {
+			return this.$api
+				.call(ApiStvAbschlusspruefung.loadAbschlusspruefung(abschlusspruefung_id))
+				.then(result => {
+					this.formData = result.data;
+					//TODO(Manu) check if cisRoot is okay
+					this.formData.link = this.cisRoot + 'index.ci.php/lehre/Pruefungsprotokoll/showProtokoll?abschlusspruefung_id=' + this.formData.abschlusspruefung_id + '&fhc_controller_id=67481e5ed5490';
+					return result;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		updateAbschlusspruefung(abschlusspruefung_id) {
+			const dataToSend = {
+				id: abschlusspruefung_id,
+				formData: this.formData
+			};
+			return this.$refs.formFinalExam
+				.call(ApiStvAbschlusspruefung.updateAbschlusspruefung(dataToSend))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('finalexamModal');
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		deleteAbschlusspruefung(abschlusspruefung_id) {
+			return this.$api
+				.call(ApiStvAbschlusspruefung.deleteAbschlusspruefung(abschlusspruefung_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		resetForm() {
+			this.formData.pruefungstyp_kurzbz = null;
+			this.formData.akadgrad_id = null;
+			this.formData.vorsitz = null;
+			this.formData.pruefungsantritt_kurzbz = null;
+			this.formData.abschlussbeurteilung_kurzbz = null;
+			this.formData.datum = null; //oder new Date();
+			this.formData.sponsion = null;
+			this.formData.pruefer1 = null;
+			this.formData.pruefer2 = null;
+			this.formData.pruefer3 = null;
+			this.formData.anmerkung = null;
+			this.formData.protokoll = null;
+			this.formData.note = null;
+			this.formData.p1 = null;
+			this.formData.p2 = null;
+			this.formData.p3 = null;
+			this.formData.pv = null;
+		},
+		search(event) {
+			if (this.abortController.mitarbeiter) {
+				this.abortController.mitarbeiter.abort();
+			}
+			this.abortController.mitarbeiter = new AbortController();
+
+			return this.$api
+				.call(ApiStvAbschlusspruefung.getMitarbeiter(event.query))
+				.then(result => {
+					this.filteredMitarbeiter = result.data.retval;
+				});
+		},
+		searchNotAkad(event) {
+			if (this.abortController.pruefer) {
+				this.abortController.pruefer.abort();
+			}
+			this.abortController.pruefer = new AbortController();
+
+			return this.$api
+				.call(ApiStvAbschlusspruefung.getPruefer(event.query))
+				.then(result => {
+					this.filteredPruefer = result.data.retval;
+				});
+		},
+		setDefaultFormData() {
+
+			this.resetForm();
+
+			if (this.stgInfo.typ === 'b') {
+				this.formData.pruefungstyp_kurzbz = 'Bachelor';
+				this.formData.protokoll = this.$p.t('abschlusspruefung', 'pruefungsnotizenMaster');
+			}
+			if (this.stgInfo.typ === 'd' || this.stgInfo === 'm') {
+				this.formData.pruefungstyp_kurzbz = 'Diplom';
+				this.formData.protokoll = this.$p.t('abschlusspruefung', 'pruefungsnotizenMaster');
+			}
+			if (this.stgInfo.typ === 'lg') {
+				this.formData.pruefungstyp_kurzbz = 'lgabschluss';
+			}
+
+			if (!this.formData.akadgrad_id && this.arrAkadGrad.length > 0) {
+				this.formData.akadgrad_id = this.arrAkadGrad[0].akadgrad_id;
+			}
+		},
+		printDocument(link) {
+			window.open(link, '_blank');
+		},
+	},
+	created() {
+		this.$api
+			.call(ApiStvAbschlusspruefung.getTypenAbschlusspruefung())
+			.then(result => {
+				this.arrTypen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAbschlusspruefung.getTypenAntritte())
+			.then(result => {
+				this.arrAntritte = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAbschlusspruefung.getBeurteilungen())
+			.then(result => {
+				this.arrBeurteilungen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAbschlusspruefung.getNoten())
+			.then(result => {
+				this.arrNoten = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAbschlusspruefung.getAkadGrade(this.student.studiengang_kz))
+			.then(result => {
+				this.arrAkadGrad = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		if (!this.student.length) {
+			this.$api
+				.call(ApiStudiengang.getStudiengangByKz(this.student.studiengang_kz))
+				.then(result => {
+					this.stgInfo = result.data;
+					this.setDefaultFormData();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		} else
+			this.getStudiengangByKz();
+	},
+	template: `
+	<div class="stv-details-abschlusspruefung h-100 pb-3">
+		<h4>{{this.$p.t('stv','tab_finalexam')}}</h4>
+		
+		<div v-if="this.student.length">
+			<abschlusspruefung-dropdown
+				:showAllFormats="isBerechtigtDocAndOdt"
+				:studentUids="studentUids"
+				:showDropDownMulti="true"
+				:stgTyp="stgInfo.typ"
+				:stgKz="stg_kz"
+				:cisRoot="cisRoot"
+				@linkGenerated="printDocument"
+			></abschlusspruefung-dropdown>
+		</div>
+
+		<core-filter-cmpt
+			v-if="!this.student.length"
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('stv', 'tab_finalexam')"
+			@click:new="actionNewAbschlusspruefung"
+			>
+		</core-filter-cmpt>
+		
+		<!--Modal: finalexamModal-->
+		<bs-modal ref="finalexamModal" dialog-class="modal-xl modal-dialog-scrollable">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('abschlusspruefung', 'abschluessPruefungAnlegen')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('abschlusspruefung', 'abschluessPruefungBearbeiten')}}</p>
+			</template>
+
+					<pruefung-list ref="pruefungList" :uid="student.uid"></pruefung-list>
+
+			<form-form v-if="!this.student.length" ref="formFinalExam" @submit.prevent>
+
+				<legend>{{this.$p.t('global','details')}}</legend>
+				<p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p>
+				<div class="row mb-3">
+					<form-input
+						container-class="col-6 stv-details-abschlusspruefung-typ"
+						:label="$p.t('global', 'typ')"
+						type="select"
+						v-model="formData.pruefungstyp_kurzbz"
+						name="pruefungstyp_kurzbz"
+						>
+						<option
+							v-for="typ in arrTypen"
+							:key="typ.pruefungstyp_kurzbz"
+							:value="typ.pruefungstyp_kurzbz"
+							>
+							{{typ.beschreibung}}
+						</option>
+					</form-input>
+					<form-input
+						container-class="col-6 stv-details-abschlusspruefung-note"
+						:label="$p.t('abschlusspruefung', 'notekommpruefung')"
+						type="select"
+						v-model="formData.note"
+						name="note"
+						>
+						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+						<option
+							v-for="note in arrNoten"
+							:key="note.note"
+							:value="note.note"
+							>
+							{{note.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="col-6 stv-details-abschlusspruefung-pruefungsantritt"
+						:label="$p.t('abschlusspruefung', 'pruefungsantritt')"
+						type="select"
+						v-model="formData.pruefungsantritt_kurzbz"
+						name="pruefungsantritt_kurzbz"
+						>
+						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+						<option
+							v-for="antritt in arrAntritte"
+							:key="antritt.pruefungsantritt_kurzbz"
+							:value="antritt.pruefungsantritt_kurzbz"
+							>
+							{{antritt.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<template v-if="statusNew">
+						<form-input
+							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
+							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
+							type="autocomplete"
+							optionLabel="mitarbeiter"
+							v-model="formData.vorsitz"
+							name="vorsitz"
+							:suggestions="filteredMitarbeiter"
+							@complete="search"
+							:min-length="3"
+							>
+						</form-input>
+					</template>
+					<template v-else >
+						<form-input
+							v-if= "formData.pv"
+							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
+							type="text"
+							name="name"
+							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
+							v-model="formData.pv"
+							>
+						</form-input>
+						<form-input
+							v-else
+							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
+							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
+							type="autocomplete"
+							optionLabel="mitarbeiter"
+							v-model="formData.vorsitz"
+							name="vorsitz"
+							:suggestions="filteredMitarbeiter"
+							@complete="search"
+							:min-length="3"
+							>
+						</form-input>
+					</template>
+
+					<template v-if="statusNew">
+						<form-input
+							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
+							:label="$p.t('abschlusspruefung', 'pruefer1')"
+							type="autocomplete"
+							optionLabel="mitarbeiter"
+							v-model="formData.pruefer1"
+							name="pruefer1"
+							:suggestions="filteredPruefer"
+							@complete="searchNotAkad"
+							:min-length="3"
+							>
+						</form-input>
+					</template>
+					<template v-else >
+						<form-input
+							v-if= "formData.p1"
+							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
+							type="text"
+							name="name"
+							:label="$p.t('abschlusspruefung', 'pruefer1')"
+							v-model="formData.p1"
+							>
+						</form-input>
+						<form-input
+							v-else
+							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
+							:label="$p.t('abschlusspruefung', 'pruefer1')"
+							type="autocomplete"
+							optionLabel="mitarbeiter"
+							v-model="formData.pruefer1"
+							name="pruefer1"
+							:suggestions="filteredPruefer"
+							@complete="searchNotAkad"
+							:min-length="3"
+							>
+						</form-input>
+					</template>
+				</div>
+
+				<div class="row mb-3">
+
+					<form-input
+						container-class="col-6 stv-details-abschlusspruefung-abschlussbeurteilung_kurzbz"
+						:label="$p.t('abschlusspruefung', 'abschlussbeurteilung')"
+						type="select"
+						v-model="formData.abschlussbeurteilung_kurzbz"
+						name="abschlussbeurteilung_kurzbz"
+						>
+						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+						<option
+							v-for="beurteilung in arrBeurteilungen"
+							:key="beurteilung.abschlussbeurteilung_kurzbz"
+							:value="beurteilung.abschlussbeurteilung_kurzbz"
+							>
+							{{beurteilung.bezeichnung}}
+						</option>
+					</form-input>
+					<template v-if="statusNew">
+						<form-input
+							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
+							:label="$p.t('abschlusspruefung', 'pruefer2')"
+							type="autocomplete"
+							optionLabel="mitarbeiter"
+							v-model="formData.pruefer2"
+							name="pruefer2"
+							:suggestions="filteredPruefer"
+							@complete="searchNotAkad"
+							:min-length="3"
+							>
+						</form-input>
+					</template>
+					<template v-else >
+						<form-input
+							v-if= "formData.p2"
+							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
+							type="text"
+							name="name"
+							:label="$p.t('abschlusspruefung', 'pruefer2')"
+							v-model="formData.p2"
+							>
+						</form-input>
+						<form-input
+							v-else
+							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
+							:label="$p.t('abschlusspruefung', 'pruefer2')"
+							type="autocomplete"
+							optionLabel="mitarbeiter"
+							v-model="formData.pruefer2"
+							name="pruefer2"
+							:suggestions="filteredPruefer"
+							@complete="searchNotAkad"
+							:min-length="3"
+							>
+						</form-input>
+					</template>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="col-6 stv-details-abschlusspruefung-akadgrad"
+						:label="$p.t('abschlusspruefung', 'akadGrad')"
+						type="select"
+						v-model="formData.akadgrad_id"
+						name="akadgrad_id"
+						>
+						<option
+							v-for="grad in arrAkadGrad"
+							:key="grad.akadgrad_id"
+							:value="grad.akadgrad_id"
+							>
+							{{grad.titel}}
+						</option>
+					</form-input>
+					<template v-if="statusNew">
+						<form-input
+							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
+							:label="$p.t('abschlusspruefung', 'pruefer3')"
+							type="autocomplete"
+							optionLabel="mitarbeiter"
+							v-model="formData.pruefer3"
+							name="pruefer3"
+							:suggestions="filteredPruefer"
+							@complete="searchNotAkad"
+							:min-length="3"
+							>
+						</form-input>
+					</template>
+					<template v-else >
+						<form-input
+							v-if= "formData.p3"
+							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
+							type="text"
+							name="name"
+							:label="$p.t('abschlusspruefung', 'pruefer3')"
+							v-model="formData.p3"
+							>
+						</form-input>
+						<form-input
+							v-else
+							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
+							:label="$p.t('abschlusspruefung', 'pruefer3')"
+							type="autocomplete"
+							optionLabel="mitarbeiter"
+							v-model="formData.pruefer3"
+							name="pruefer3"
+							:suggestions="filteredPruefer"
+							@complete="searchNotAkad"
+							:min-length="3"
+							>
+						</form-input>
+					</template>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="col-6 stv-details-abschlusspruefung-datum"
+						:label="$p.t('global', 'datum')"
+						type="DatePicker"
+						v-model="formData.datum"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						name="datum"
+						:teleport="true"
+						>
+					</form-input>
+					<form-input
+						container-class="col-6 stv-details-abschlusspruefung-anmerkung"
+						:label="$p.t('global', 'anmerkung')"
+						type="textarea"
+						v-model="formData.anmerkung"
+						name="anmerkung"
+						>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="col-6 stv-details-abschlusspruefung-sponsion"
+						:label="$p.t('abschlusspruefung', 'sponsion')"
+						type="DatePicker"
+						v-model="formData.sponsion"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						name="sponsion"
+						:teleport="true"
+						>
+					</form-input>
+					<form-input
+						container-class="col-6 stv-details-abschlusspruefung-protokoll"
+						:label="$p.t('abschlusspruefung', 'protokoll')"
+						type="textarea"
+						v-model="formData.protokoll"
+						name="protokoll"
+						:rows= 10
+						>
+					</form-input>
+				</div>
+
+				<div class="row mb-3 col-6">
+					<div class="col">
+						<p >{{$p.t('abschlusspruefung', 'zurBeurteilung')}}</p>
+					</div>
+					<div class="col">
+						<p>
+							<a :href="formData.link" target="_blank" rel="noopener noreferrer">
+								{{$p.t('abschlusspruefung', 'pruefungsprotokoll')}}
+							</a>
+						</p>
+					</div>
+				</div>
+
+			</form-form>
+
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+					<button v-if="statusNew" class="btn btn-primary" @click="addNewAbschlusspruefung()"> {{$p.t('ui', 'speichern')}}</button>
+					<button v-else class="btn btn-primary" @click="updateAbschlusspruefung(formData.abschlusspruefung_id)"> {{$p.t('ui', 'speichern')}}</button>
+			</template>
+
+		</bs-modal>
+
+		<Teleport v-for="data in tabulatorData" :key="data.abschlusspruefung_id" :to="data.actionDiv">
+			<abschlusspruefung-dropdown
+				:showAllFormats="isBerechtigtDocAndOdt"
+				:showDropDownMulti="false"
+				:abschlusspruefung_id="data.abschlusspruefung_id"
+				:studentUids="data.student_uid"
+				:stgPrfgTyp="data.pruefungstyp_kurzbz"
+				:stgKz="stg_kz"
+				:cisRoot="cisRoot"
+				@linkGenerated="printDocument"
+			></abschlusspruefung-dropdown>
+		</Teleport>		
+	</div>
+`
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
new file mode 100644
index 000000000..a6256ceb1
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -0,0 +1,461 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
+import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+
+import ApiStvProjektarbeit from '../../../../../api/factory/stv/projektarbeit.js';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		FormForm,
+		FormInput,
+		PvAutoComplete
+	},
+	emits: ['details-saved'],
+	inject: {
+		defaultSemester: {
+			from: 'defaultSemester'
+		}
+		//~ cisRoot: {
+			//~ from: 'cisRoot'
+		//~ },
+		//~ config: {
+			//~ from: 'config',
+			//~ required: true
+		//~ }
+	},
+	computed: {
+		arrLes() {
+			let lehreinheiten = [];
+			if (this.formData.lehrveranstaltung_id) {
+				let lv = this.arrLvs.find(lv => {return lv.lehrveranstaltung_id == this.formData.lehrveranstaltung_id});
+				if (lv) lehreinheiten = lv.lehreinheiten
+			}
+
+			for (let le of lehreinheiten)
+			{
+				let bezeichnung = le.lehrfach_kurzbz + '-' + le.lehrform_kurzbz + ' ' + le.lehrfach_bezeichnung + ' ';
+
+				for (let grp of le.lehreinheitgruppen)
+				{
+					bezeichnung += grp.gruppe_kurzbz ? grp.gruppe_kurzbz : '' + grp.semester ?? '' + grp.verband ?? '' + grp.gruppe ?? '';
+				}
+
+				bezeichnung += ' (' + le.lektoren.join(' ') + ') ID: ' + le.lehreinheit_id;
+
+				le.bezeichnung = bezeichnung;
+			}
+
+			return lehreinheiten;
+		},
+		//~ preparedFormData() {
+			//~ console.log("FOR DATA CALLEd");
+			//~ if (this.formData.projektarbeit_id == null) delete(this.formData.projektarbeit_id);
+			//~ if (this.formData.firma) this.formData.firma_id = this.formData.firma.firma_id;
+			//~ delete(this.formData.firma);
+			//~ delete(this.formData.firma_name);
+			//~ delete(this.formData.lehrveranstaltung_id);
+			//~ // convert null value fields from string to null
+			//~ return this.formData;
+		//~ }
+	},
+	props: {
+		statusNew: Boolean,
+		student: Object,
+		projektarbeit: Object,
+		stg_kz: Number
+	},
+	data() {
+		return {
+			formData: {
+				projektarbeit_id: null,
+				titel: null,
+				titel_english: null,
+				themenbereich: null,
+				projekttyp_kurzbz: null,
+				firma: null,
+				lehrveranstaltung_id: null,
+				lehreinheit_id: null,
+				beginn: null,
+				ende: null,
+				freigegeben: true,
+				gesperrtbis: null,
+				note: null,
+				final: true,
+				anmerkung: null
+			},
+			arrTypen: [],
+			arrFirmen: [],
+			arrLvs: [],
+			arrNoten: [],
+			filteredFirmen: [],
+			abortController: {
+				firma: null
+			}
+		}
+	},
+	methods: {
+		resetForm() {
+			this.formData.projektarbeit_id = null;
+			this.formData.titel = null;
+			this.formData.titel_english = null;
+			this.formData.themenbereich = null;
+			this.formData.projekttyp_kurzbz = null;
+			this.formData.firma = null;
+			this.formData.lehrveranstaltung_id = null;
+			this.formData.lehreinheit_id = null;
+			this.formData.beginn = null;
+			this.formData.ende = null;
+			this.formData.freigegeben = true;
+			this.formData.gesperrtbis = null;
+			this.formData.note = null;
+			this.formData.final = true;
+			this.formData.anmerkung = null;
+		},
+		getFormData(statusNew, studiensemester_kurzbz, additional_lehrveranstaltung_id/*, successCallback*/) {
+
+			//~ let callArray = [
+				//~ this.$api.call(ApiStvProjektarbeit.getTypenProjektarbeit()),
+				//~ this.$api.call(ApiStvProjektarbeit.getLehrveranstaltungen(
+					//~ this.student.uid,
+					//~ projektarbeit_id ? null : this.student.studiengang_kz,
+					//~ studiensemester_kurzbz ?? this.defaultSemester,
+					//~ additional_lehrveranstaltung_id ?? null
+				//~ )),
+				//~ this.$api.call(ApiStvProjektarbeit.getNoten())
+			//~ ];
+
+			//~ if (projektarbeit_id) callArray.push(this.$api.call(ApiStvProjektarbeit.loadProjektarbeit(projektarbeit_id)));
+
+			//~ // Run when All promises are settled
+			//~ Promise.allSettled(callArray).then((results) => {
+				//~ let hasError = false;
+				//~ let allFormData = [];
+				//~ results.forEach((promise_result) => {
+
+					//~ if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
+						//~ allFormData.push(promise_result.value.data);
+					//~ } else {
+						//~ hasError = true;
+						//~ //this.$fhcAlert.handleSystemError(promise_result);
+					//~ }
+					//~ //let data = promise_result.value.data;
+					//~ console.log(promise_result.status);
+				//~ });
+
+				//~ if (!hasError) {
+					//~ this.setFormData(allFormData[0], allFormData[1], allFormData[2], allFormData[3], allFormData[4] ?? null);
+					//~ if (successCallback) successCallback();
+				//~ }
+			//~ });
+
+			this.$api
+				.call(ApiStvProjektarbeit.getTypenProjektarbeit())
+				.then(result => {
+					this.arrTypen = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
+			this.$api
+				.call(ApiStvProjektarbeit.getLehrveranstaltungen(
+					this.student.uid,
+					statusNew ? this.student.studiengang_kz : null,
+					studiensemester_kurzbz ?? this.defaultSemester,
+					additional_lehrveranstaltung_id
+				))
+				.then(result => {
+						this.arrLvs = result.data
+					}
+				)
+				.catch(this.$fhcAlert.handleSystemError);
+
+			this.$api
+				.call(ApiStvProjektarbeit.getNoten())
+				.then(result => {
+					this.arrNoten = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		setFormData(arrTypen, arrLvs, arrNoten, projektarbeitData) {
+			this.arrTypen = arrTypen;
+			this.arrLvs = arrLvs;
+			this.arrNoten = arrNoten;
+			if (projektarbeitData) {
+				projektarbeitData.firma = {firma_id: projektarbeitData.firma_id, name: projektarbeitData.firma_name};
+				this.formData = projektarbeitData;
+			}
+		},
+		loadProjektarbeit(projektarbeit_id) {
+
+			return this.$api
+				.call(ApiStvProjektarbeit.loadProjektarbeit(projektarbeit_id))
+				.then(result => {
+					this.formData = result.data;
+					return result;
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+		},
+		addNewProjektarbeit() {
+
+			let dataToSend = {
+				uid: this.student.uid,
+				formData: this.getPreparedFormData()
+			};
+
+			return this.$refs.formDetails
+				.call(ApiStvProjektarbeit.addNewProjektarbeit(dataToSend));
+		},
+		updateProjektarbeit() {
+
+			let dataToSend = {
+				projektarbeit_id: this.formData.projektarbeit_id,
+				formData: this.getPreparedFormData()
+			};
+			return this.$refs.formDetails
+				.call(ApiStvProjektarbeit.updateProjektarbeit(dataToSend));
+		},
+		searchFirma(event) {
+			if (this.abortController.firma) {
+				this.abortController.firma.abort();
+			}
+			this.abortController.firma = new AbortController();
+
+			return this.$api
+				.call(ApiStvProjektarbeit.getFirmen(event.query))
+				.then(result => {
+					this.filteredFirmen = result.data;
+				});
+		},
+		lvChanged(event) {
+			this.formData.lehreinheit_id = null;
+		},
+		getPreparedFormData() {
+			let preparedFormData = JSON.parse(JSON.stringify(this.formData)); // deep copy
+
+			// delete "helper" fields
+			if (preparedFormData.projektarbeit_id == null) delete(preparedFormData.projektarbeit_id);
+			if (preparedFormData.firma) preparedFormData.firma_id = preparedFormData.firma.firma_id;
+			delete(preparedFormData.firma);
+			delete(preparedFormData.firma_name);
+			delete(preparedFormData.lehrveranstaltung_id);
+
+			return preparedFormData;
+		}
+		//~ setDefaultFormData() {
+			//~ this.resetForm();
+		//~ },
+	},
+	template: `
+			<form-form v-if="!this.student.length" ref="formDetails" @submit.prevent>
+
+				<legend>{{this.$p.t('global','details')}}</legend>
+				<p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektarbeit-titel"
+						type="text"
+						name="titel"
+						:label="$p.t('projektarbeit', 'titel')"
+						v-model="formData.titel"
+						>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektarbeit-titel_english"
+						type="text"
+						name="titel_english"
+						:label="$p.t('projektarbeit', 'titelEnglisch')"
+						v-model="formData.titel_english"
+						>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektarbeit-themenbereich"
+						type="text"
+						name="themenbereich"
+						:label="$p.t('projektarbeit', 'themenbereich')"
+						v-model="formData.themenbereich"
+						>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektarbeit-typ"
+						:label="$p.t('global', 'typ')"
+						type="select"
+						v-model="formData.projekttyp_kurzbz"
+						name="projekttyp_kurzbz"
+						>
+						<option
+							v-for="typ in arrTypen"
+							:key="typ.projekttyp_kurzbz"
+							:value="typ.projekttyp_kurzbz"
+							>
+							{{typ.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+
+
+				<div class="row mb-3">
+					<!-- <form-input
+						v-if= "formData.firma_name"
+						container-class="col-6 stv-details-projektarbeit-firma"
+						type="text"
+						name="name"
+						:label="$p.t('projektarbeit', 'firma')"
+						v-model="formData.firma_name"
+						>
+					</form-input> -->
+					<form-input
+						container-class="stv-details-projektarbeit-firma"
+						:label="$p.t('projektarbeit', 'firma')"
+						type="autocomplete"
+						optionLabel="name"
+						v-model="formData.firma"
+						name="firma"
+						:suggestions="filteredFirmen"
+						@complete="searchFirma"
+						:min-length="3"
+						>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektarbeit-lv"
+						:label="$p.t('projektarbeit', 'lehrveranstaltung')"
+						type="select"
+						v-model="formData.lehrveranstaltung_id"
+						name="lehrveranstaltung_id"
+						@change="lvChanged($event)"
+						>
+						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+						<option
+							v-for="lv in arrLvs"
+							:key="lv.lehrveranstaltung_id"
+							:value="lv.lehrveranstaltung_id"
+							>
+							{{lv.bezeichnung + ' ' + lv.orgform_kurzbz + ' (' + lv.semester + ' Sem) ID: ' + lv.lehrveranstaltung_id}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektarbeit-le"
+						:label="$p.t('global', 'lvTeil')"
+						type="select"
+						v-model="formData.lehreinheit_id"
+						name="lehreinheit_id"
+						>
+						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+						<option
+							v-for="le in arrLes"
+							:key="le.lehreinheit_id"
+							:value="le.lehreinheit_id"
+							>
+							{{le.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="col-6 stv-details-projektarbeit-beginn"
+						:label="$p.t('projektarbeit', 'beginn')"
+						type="DatePicker"
+						v-model="formData.beginn"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						name="beginn"
+						>
+					</form-input>
+					<form-input
+						container-class="col-6 stv-details-projektarbeit-ende"
+						:label="$p.t('projektarbeit', 'ende')"
+						type="DatePicker"
+						v-model="formData.ende"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						name="ende"
+						>
+					</form-input>
+				</div>
+
+				<div class="row mb-3 align-items-center">
+					<form-input
+						container-class="col-8 stv-details-projektarbeit-gesperrtbis"
+						:label="$p.t('projektarbeit', 'gesperrtbis')"
+						type="DatePicker"
+						v-model="formData.gesperrtbis"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						name="gesperrtbis"
+						>
+					</form-input>
+					<div class="col-4">
+						<form-input
+							container-class="form-check stv-details-projektarbeit-freigegeben"
+							type="checkbox"
+							name="freigegeben"
+							:label="$p.t('projektarbeit','freigegeben')"
+							v-model="formData.freigegeben"
+						>
+						</form-input>
+					</div>
+				</div>
+
+				<div class="row mb-3 align-items-center">
+					<form-input
+						container-class="col-8 stv-details-projektarbeit-note"
+						:label="$p.t('projektarbeit', 'note')"
+						type="select"
+						v-model="formData.note"
+						name="note"
+						>
+						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+						<option
+							v-for="note in arrNoten"
+							:key="note.note"
+							:value="note.note"
+							>
+							{{note.bezeichnung}}
+						</option>
+					</form-input>
+					<div class="col-4">
+						<form-input
+							container-class="form-check stv-details-projektarbeit-final"
+							type="checkbox"
+							name="final"
+							:label="$p.t('projektarbeit','final')"
+							v-model="formData.final"
+						>
+						</form-input>
+					</div>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="col-12 stv-details-abschlusspruefung-anmerkung"
+						:label="$p.t('projektarbeit', 'anmerkung')"
+						type="textarea"
+						v-model="formData.anmerkung"
+						name="anmerkung"
+						:rows= 3
+						>
+					</form-input>
+				</div>
+
+			</form-form>`
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
new file mode 100644
index 000000000..034b3fd6c
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -0,0 +1,377 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
+import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+
+
+import ApiStvProjektarbeit from '../../../../../api/factory/stv/projektarbeit.js';
+import ProjektarbeitDetails from "./Details.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		FormForm,
+		FormInput,
+		PvAutoComplete,
+		ProjektarbeitDetails
+	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+		config: {
+			from: 'config',
+			required: true
+		},
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		},
+		isBerechtigtDocAndOdt: {
+			from: 'hasPermissionOutputformat',
+			default: false
+		}
+	},
+	computed: {
+		//~ studentUids() {
+			//~ if (this.student.uid)
+			//~ {
+				//~ return [this.student.uid];
+			//~ }
+			//~ return this.student.map(e => e.uid);
+		//~ },
+		studentKzs(){
+			if (this.student.uid)
+			{
+				return [this.student.studiengang_kz];
+			}
+			return this.student.map(e => e.studiengang_kz);
+		},
+		stg_kz(){
+			return this.studentKzs.length > 0 ? this.studentKzs.length[0] : null;
+		}
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(ApiStvProjektarbeit.getProjektarbeit(this.student.uid)),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Projektarbeit ID", field: "projektarbeit_id", visible: false},
+					{title: "Typ", field: "projekttyp_kurzbz"},
+					{title: "Studiensemester", field: "studiensemester_kurzbz"},
+					{title: "Titel", field: "titel"},
+					{
+						title: "Abgabe Enduplad",
+						field: "abgabedatum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}
+					},
+					{
+						title: "Beginn",
+						field: "beginn",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						},
+						visible: false
+					},
+					{
+						title: "Ende",
+						field: "ende",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						},
+						visible: false
+					},
+					{
+						title:"Freigegeben",
+						field:"freigegeben",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						},
+						visible: false
+					},
+					{
+						title: "Gesperrt bis",
+						field: "gesperrtbis",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						},
+						visible: false
+					},
+					{title: "Themenbereich", field: "themenbereich", visible: false},
+					{title: "Anmerkung", field: "anmerkung", visible: false},
+					{title: "Lehreinheit ID", field: "lehreinheit_id", visible: false},
+					{title: "Student UID", field: "student_uid", visible: false},
+					{
+						title:"Final",
+						field:"final",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						},
+						visible: false
+					},
+					{title: "Firma ID", field: "firma_id", visible: false},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = this.$p.t('ui', 'bearbeiten');
+							button.addEventListener('click', (event) => {
+								let data = cell.getData();
+								this.actionEditProjektarbeit(data.projektarbeit_id, data.studiensemester_kurzbz, data.lehrveranstaltung_id);
+							});
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = this.$p.t('ui', 'loeschen');
+							button.addEventListener('click', () =>
+								this.actionDeleteProjektarbeit(cell.getData().projektarbeit_id)
+							);
+							container.append(button);
+
+							container.append(cell.getData().actionDiv);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				minHeight: '200',
+				selectable: 1,
+				index: 'projektarbeit_id',
+				persistenceID: 'stv-details-projektarbeit'
+			},
+			tabulatorEvents: [
+				{
+					event: 'rowSelectionChanged',
+					handler: this.rowSelectionChanged
+				},
+				{
+					event: 'dataLoaded',
+					handler: data => this.tabulatorData = data.map(item => {
+						item.actionDiv = document.createElement('div');
+						return item;
+					}),
+				},
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'person', 'stv', 'ui']);
+
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						//~ cm.getColumnByField('vorsitz_nachname').component.updateDefinition({
+							//~ title: this.$p.t('abschlusspruefung', 'vorsitz_header')
+						//~ });
+						/*
+						cm.getColumnByField('actions').component.updateDefinition({
+						title: this.$p.t('global', 'aktionen')
+												});
+						*/
+					}
+				},
+			],
+			tabulatorData: [],
+			lastSelected: null,
+			statusNew: true,
+			studiensemester_kurzbz: null,
+			lehrveranstaltung_id: null
+		}
+	},
+	//~ watch: {
+		//~ student(){
+			//~ if (this.$refs.table) {
+				//~ this.$refs.table.reloadTable();
+			//~ }
+			//~ this.getStudiengangByKz();
+		//~ }
+	//~ },
+	methods: {
+		actionNewProjektarbeit() {
+			this.statusNew = true;
+			this.$refs.projektarbeitDetails.resetForm();
+			this.$refs.projektarbeitDetails.getFormData();
+			this.$refs.projektarbeitModal.show();
+		},
+		actionEditProjektarbeit(projektarbeit_id, studiensemester_kurzbz, lehrveranstaltung_id) {
+			this.statusNew = false;
+			this.$refs.projektarbeitDetails.getFormData(this.statusNew, studiensemester_kurzbz, lehrveranstaltung_id);
+			this.$refs.projektarbeitDetails.loadProjektarbeit(projektarbeit_id);
+			this.$refs.projektarbeitModal.show();
+		},
+		actionDeleteProjektarbeit(projektarbeit_id) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? projektarbeit_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteProjektarbeit)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		addNewProjektarbeit() {
+			Promise.allSettled([
+				this.$refs.projektarbeitDetails.addNewProjektarbeit()
+			]).then((results) => {
+				let hasError = false;
+				results.forEach((promise_result) => {
+
+					if (!(promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success")) {
+
+						hasError = true;
+					}
+				});
+
+				if (!hasError) {
+					this.projektarbeitSaved();
+				}
+			});
+		},
+		updateProjektarbeit() {
+			Promise.allSettled(
+			[
+				this.$refs.projektarbeitDetails.updateProjektarbeit()
+			]).then((results) => {
+				let hasError = false;
+				results.forEach((promise_result) => {
+
+					if (!(promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success")) {
+
+						hasError = true;
+					}
+				});
+
+				if (!hasError) {
+					this.projektarbeitSaved();
+				}
+			});
+		},
+		deleteProjektarbeit(projektarbeit_id) {
+			return this.$api
+				.call(ApiStvProjektarbeit.deleteProjektarbeit(projektarbeit_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		projektarbeitSaved() {
+			this.reload();
+			this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+			this.hideModal('projektarbeitModal');
+			this.$refs.projektarbeitDetails.resetForm();
+		},
+		rowSelectionChanged(data) {
+			console.log("selection changed");
+			this.lastSelected = data.length > 0 ? data[0] : null;
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	created() {
+	},
+	template: `
+	<div class="stv-details-projektarbeit h-100 pb-3">
+		<h4>{{this.$p.t('stv','tab_projektarbeit')}}</h4>
+
+		<core-filter-cmpt
+			v-if="!this.student.length"
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('stv', 'tab_projektarbeit')"
+			@click:new="actionNewProjektarbeit"
+			>
+		</core-filter-cmpt>
+
+		<!--Modal: projektarbeitModal-->
+		<bs-modal ref="projektarbeitModal" dialog-class="modal-xl modal-dialog-scrollable">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('projektarbeit', 'projektarbeitAnlegen')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('projektarbeit', 'projektarbeitBearbeiten')}}</p>
+			</template>
+
+			<projektarbeit-details ref="projektarbeitDetails" :student="student" :stg_kz="stg_kz"></projektarbeit-details>
+
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+					<button v-if="statusNew" class="btn btn-primary" @click="addNewProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
+					<button v-else class="btn btn-primary" @click="updateProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
+			</template>
+
+		</bs-modal>
+	</div>
+`
+}
+

From 382006aa8bfdec7696256d2b2236eb448003daf7 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 16 May 2025 13:37:21 +0200
Subject: [PATCH 002/101] Projektarbeit Studierendenverwaltung: now possible to
 save and edit Projektbetreuer

---
 application/config/stv.php                    |   7 +-
 .../api/frontend/v1/stv/Config.php            |   5 +-
 .../api/frontend/v1/stv/Projektarbeit.php     |  11 +-
 .../api/frontend/v1/stv/Projektbetreuer.php   | 333 +++++++
 .../models/education/Projektarbeit_model.php  |   9 +-
 .../education/Projektbetreuer_model.php       |   1 +
 application/models/person/Person_model.php    |  19 +-
 .../models/ressource/Stundensatz_model.php    |  95 +-
 public/js/api/factory/stv/projektbetreuer.js  |  73 ++
 .../Details/Projektarbeit/Betreuung.js        | 847 ------------------
 .../Details/Projektarbeit/Details.js          |  27 +-
 .../Details/Projektarbeit/Projektarbeit.js    |  86 +-
 .../Details/Projektarbeit/Projektbetreuer.js  | 421 +++++++++
 system/phrasesupdate.php                      |   2 +-
 14 files changed, 1002 insertions(+), 934 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Projektbetreuer.php
 create mode 100644 public/js/api/factory/stv/projektbetreuer.js
 delete mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Betreuung.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js

diff --git a/application/config/stv.php b/application/config/stv.php
index 31ce3f521..f5c1599ab 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -54,7 +54,7 @@ $config['tabs'] =
 			],
 		]
 	];
-	
+
 // List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
 $fieldsZgvDoktor = ['zgvdoktorort', 'zgvdoktordatum', 'zgvdoktornation', 'zgvdoktor_erfuellt', 'zgvdoktor_code'];
 
@@ -74,3 +74,8 @@ if (!defined('ZGV_DOKTOR_ANZEIGEN') || !ZGV_DOKTOR_ANZEIGEN) {
 		$fieldsZgvDoktor
 	);
 }
+
+$config['tabs']['projektarbeit']['defaultProjektbetreuerStunden'] = '4.0';
+$config['tabs']['projektarbeit']['defaultProjektbetreuerStundenDiplom'] = '5.0';
+$config['tabs']['projektarbeit']['lvLektroinnenzuteilungFixangestelltStundensatz'] = true;
+$config['tabs']['projektarbeit']['defaultProjektbetreuerStundensatz'] = '80.0';
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index dd2eaed02..afdf8efb8 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -125,7 +125,8 @@ class Config extends FHCAPI_Controller
 
 		$result['projektarbeit'] = [
 			'title' => $this->p->t('stv', 'tab_projektarbeit'),
-			'component' => './Stv/Studentenverwaltung/Details/Projektarbeit.js'
+			'component' => './Stv/Studentenverwaltung/Details/Projektarbeit.js',
+			'config' => $config['projektarbeit']
 		];
 
 		$result['mobility'] = [
@@ -323,7 +324,7 @@ class Config extends FHCAPI_Controller
 		$title_eng = $this->p->t("global", "englisch");
 		$title_ff = $this->p->t("stv", "document_certificate");
 		$title_lv = $this->p->t("stv", "document_coursecertificate");
-		
+
 		$link_ff = "documents/export/" .
 			"zertifikat.rdf.php/" .
 			"Zertifikat" .
diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index 3be2b26a3..70775fdbc 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -17,7 +17,7 @@ class Projektarbeit extends FHCAPI_Controller
 			'getTypenProjektarbeit' => ['admin:r', 'assistenz:r'],
 			'getFirmen' => ['admin:r', 'assistenz:r'],
 			'getLehrveranstaltungen' => ['admin:r', 'assistenz:r'],
-			'getNoten' => ['admin:rw', 'assistenz:rw']
+			'getNoten' => ['admin:r', 'assistenz:r']
 		]);
 
 		// Load Libraries
@@ -91,7 +91,7 @@ class Projektarbeit extends FHCAPI_Controller
 		);
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id');
+		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
 		$result = $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);
@@ -170,7 +170,7 @@ class Projektarbeit extends FHCAPI_Controller
 		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
 
 		$result = $this->ProjektarbeitModel->delete(
-			array('projektarbeit_id' => $projektarbeit_id)
+			['projektarbeit_id' => $projektarbeit_id]
 		);
 
 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -273,10 +273,9 @@ class Projektarbeit extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
 		]);
 
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|numeric', [
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|is_natural', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
-			//'matches' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
-			'numeric' =>  $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
+			'is_natural' =>  $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
 		]);
 
 		$this->form_validation->set_rules('beginn', 'Beginn', 'is_valid_date', [
diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
new file mode 100644
index 000000000..ac6663132
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -0,0 +1,333 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Projektbetreuer extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getProjektbetreuer' => ['admin:r', 'assistenz:r'],
+			'saveProjektbetreuer' => ['admin:rw', 'assistenz:rw'],
+			'deleteProjektbetreuer' => ['admin:rw', 'assistenz:rw'],
+			'getBetreuerarten' => ['admin:r', 'assistenz:r'],
+			'getNoten' => ['admin:r', 'assistenz:r'],
+			'getDefaultStundensaetze' => ['admin:r', 'assistenz:r'],
+			'getProjektbetreuerBySearchQuery' => ['admin:r', 'assistenz:r'],
+			'validateProjektbetreuer' => ['admin:r', 'assistenz:r']
+		]);
+
+		// Load Libraries
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'person',
+			'projektarbeit'
+		]);
+
+		// Load models
+		$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
+		$this->load->model('education/Betreuerart_model', 'BetreuerartModel');
+		$this->load->model('ressource/Stundensatz_model', 'StundensatzModel');
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$this->load->model('education/Note_model', 'NoteModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		// load libraries
+		$this->load->library('PermissionLib');
+	}
+
+	public function getProjektbetreuer()
+	{
+		$projektarbeit_id = $this->input->get('projektarbeit_id');
+
+		if (!isset($projektarbeit_id)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
+
+		$this->ProjektbetreuerModel->addSelect(
+			'projektarbeit_id, person_id, nachname, vorname, note, punkte, stunden, stundensatz, betreuerart_kurzbz, vertrag_id, titelpre, titelpost'
+		);
+		$this->ProjektbetreuerModel-> addSelect("CASE
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=pers.person_id)
+				THEN 'Mitarbeiter'
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=pers.person_id)
+				THEN 'Student'
+				ELSE 'Person'
+			END AS status");
+		$this->ProjektbetreuerModel->addJoin('public.tbl_person pers', 'person_id');
+		$result = $this->ProjektbetreuerModel->loadWhere(['projektarbeit_id' => $projektarbeit_id]);
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$projektbetreuer = getData($result);
+
+		//~ foreach ($projektbetreuer as $projektarbeit)
+		//~ {
+			//~ $projektarbeit_id = $projektarbeit->projektarbeit_id;
+			//~ $abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
+
+			//~ if (isError($abgabeRes)) $this->terminateWithError(getError($abgabeRes), self::ERROR_TYPE_GENERAL);
+
+			//~ if (hasData($abgabeRes))
+			//~ {
+				//~ $paabgabe = getData($abgabeRes)[0];
+				//~ $projektarbeit->abgabedatum = $paabgabe->abgabedatum;
+			//~ }
+		//~ }
+
+		$this->terminateWithSuccess($this->_addFullNameToBetreuer($projektbetreuer));
+	}
+
+	public function saveProjektbetreuer()
+	{
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+
+		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$projektbetreuer = $this->input->post('projektbetreuerListe');
+
+		//$this->addMeta('form', $projektbetreuer);
+
+		if (!is_array($projektbetreuer))
+		{
+			return $this->terminateWithError(
+				$this->p->t('projektarbeit', 'error_invalidProjektbetreuer'), self::ERROR_TYPE_GENERAL
+			);
+		}
+
+		foreach ($projektbetreuer as $pb)
+		{
+			if ($this->_validate($pb) == false)
+			{
+				$this->addMeta('test', 'foisch');
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+			}
+		}
+
+		$result = null;
+
+		foreach ($projektbetreuer as $pb)
+		{
+		//~ $this->addMeta('form', $pb);
+		//~ error_log(print_r($pb, true));
+		//die();
+
+			//~ $this->ProjektbetreuerModel->addSelect('1');
+			//~ $checkResult = $this->ProjektbetreuerModel->loadWhere(
+				//~ ['person_id' => $pb['person_id'], 'projektarbeit_id' => $projektarbeit_id, 'betreuerart_kurzbz' => $pb['betreuerart_kurzbz']]
+			//~ );
+
+			//~ if (isError($checkResult)) $this->terminateWithError(getError($checkResult), self::ERROR_TYPE_GENERAL);
+
+			$betreuer = [
+				'projektarbeit_id' => $projektarbeit_id,
+				'person_id' => $pb['person_id'],
+				'note' => $pb['note'],
+				'stunden' => $pb['stunden'],
+				'stundensatz' => $pb['stundensatz'],
+				'betreuerart_kurzbz' => $pb['betreuerart_kurzbz']
+			];
+
+			if (isset($pb['person_id_old']) && isset($pb['betreuerart_kurzbz_old']))
+			{
+				$result = $this->ProjektbetreuerModel->update(
+					[
+						'projektarbeit_id' => $projektarbeit_id,
+						'person_id' => $pb['person_id_old'],
+						'betreuerart_kurzbz' => $pb['betreuerart_kurzbz_old']
+					],
+					array_merge($betreuer, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
+				);
+			}
+			else
+			{
+				$result = $this->ProjektbetreuerModel->insert(
+					array_merge($betreuer, ['insertamum' => date('c'), 'insertvon' => getAuthUID()])
+				);
+			}
+
+			if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	public function deleteProjektbetreuer()
+	{
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$person_id = $this->input->post('person_id');
+		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
+
+		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektbetreuer ID'], self::ERROR_TYPE_GENERAL));
+
+		if (!isset($person_id) || !is_numeric($person_id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID'], self::ERROR_TYPE_GENERAL));
+
+		if (!isset($betreuerart_kurzbz))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Betreuerart'], self::ERROR_TYPE_GENERAL));
+
+		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$validate = $this->_validateDelete($projektarbeit_id, $person_id);
+
+		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->ProjektbetreuerModel->delete(
+			['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id, 'betreuerart_kurzbz' => $betreuerart_kurzbz]
+		);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result))
+		{
+			$this->outputJson($result);
+		}
+
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+	public function getBetreuerarten()
+	{
+		$result = $this->BetreuerartModel->loadWhere(['aktiv' => true]);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	public function getNoten()
+	{
+		$result = $this->NoteModel->load();
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	public function getDefaultStundensaetze()
+	{
+		$person_id = $this->input->get('person_id');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+
+		$result = $this->StundensatzModel->getStundensatzForMitarbeiter($person_id, $studiensemester_kurzbz);
+
+		$this->addMeta('res', $result);
+
+		//if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function getProjektbetreuerBySearchQuery()
+	{
+		$searchString = $this->input->get('searchString');
+
+		if (!isset($searchString)) $this->terminateWithError($this->p->t('projektarbeit', 'error_searchStringMissing', self::ERROR_TYPE_GENERAL));
+
+		$result = $this->PersonModel->searchPerson($searchString);
+
+		$this->addMeta('met', $result);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? $this->_addFullNameToBetreuer(getData($result)) : []);
+	}
+
+	/**
+	 *
+	 * @param
+	 * @return object success or error
+	 */
+	public function validateProjektbetreuer()
+	{
+		$projektbetreuerArr = $this->input->post('projektbetreuer');
+
+		if (!is_array($projektbetreuerArr)) $projektbetreuerArr = [$projektbetreuerArr];
+
+		foreach ($projektbetreuerArr as $pb)
+		{
+			if ($this->_validate($pb) == false)
+			{
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+			}
+		}
+
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
+	 *
+	 * @param
+	 * @return object success or error
+	 */
+	private function _validate($formData)
+	{
+		$this->form_validation->set_data($formData);
+
+		$this->form_validation->set_rules('betreuerart_kurzbz', 'Betreuerart', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betreuerart'])
+		]);
+
+		$this->form_validation->set_rules('person_id', 'Person', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Person ID'])
+		]);
+
+		$this->form_validation->set_rules('stunden', 'Stunden', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stunden'])
+		]);
+
+		$this->form_validation->set_rules('stundensatz', 'Stundensatz', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stundensatz'])
+		]);
+
+
+		return $this->form_validation->run();
+	}
+
+	/**
+	 *
+	 * @param
+	 * @return object success or error
+	 */
+	private function _validateDelete($projektarbeit_id, $person_id)
+	{
+		$this->ProjektbetreuerModel->addSelect('vertrag_id');
+		$result = $this->ProjektbetreuerModel->loadWhere(['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id]);
+
+		if (isError($result)) return $result;
+
+		if (hasData($result) && getData($result)[0]->vertrag_id != null) return error($this->p->t('projektarbeit', 'error_betreuerHatVertrag'));
+
+		return success();
+	}
+
+	/**
+	 *
+	 * @param
+	 * @return object success or error
+	 */
+	private function _addFullNameToBetreuer($betreuerArr)
+	{
+		foreach ($betreuerArr as $betreuer)
+		{
+			$betreuer->name = ($betreuer->titelpre ? $betreuer->titelpre . ' ' : '') .
+				$betreuer->nachname . ' ' . $betreuer->vorname . ($betreuer->titelpost ? ' ' . $betreuer->titelpre : '').
+				' (' . $betreuer->status . ')';
+		}
+
+		return $betreuerArr;
+	}
+}
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 2be79f8e9..357886de1 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -29,12 +29,11 @@ class Projektarbeit_model extends DB_Model
 					tbl_firma.name AS firma_name
 				FROM
 					lehre.tbl_projektarbeit
-				JOIN
-					lehre.tbl_projekttyp USING (projekttyp_kurzbz), lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, public.tbl_firma
+					JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
+					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+					LEFT JOIN public.tbl_firma USING (firma_id)
 				WHERE
-					tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
-					tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
-					tbl_projektarbeit.firma_id = tbl_firma.firma_id AND
 					tbl_projektarbeit.student_uid = ?";
 
 		$params = array($student_uid);
diff --git a/application/models/education/Projektbetreuer_model.php b/application/models/education/Projektbetreuer_model.php
index 95950bf95..02368ae21 100644
--- a/application/models/education/Projektbetreuer_model.php
+++ b/application/models/education/Projektbetreuer_model.php
@@ -10,6 +10,7 @@ class Projektbetreuer_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'lehre.tbl_projektbetreuer';
 		$this->pk = array('betreuerart_kurzbz', 'projektarbeit_id', 'person_id');
+		$this->hasSequence = false;
 	}
 
     /**
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 997048972..d955f6401 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -151,12 +151,21 @@ class Person_model extends DB_Model
 	 */
 	public function searchPerson($filter)
 	{
-		$this->addSelect('vorname, nachname, gebdatum, person_id');
+		$this->addSelect('vorname, nachname, gebdatum, person_id, titelpre, titelpost');
+		$this->addSelect("CASE
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=tbl_person.person_id)
+				THEN 'Mitarbeiter'
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=tbl_person.person_id)
+				THEN 'Student'
+				ELSE 'Person'
+			END AS status");
 		$result = $this->loadWhere(
-			'lower(nachname) like '.$this->db->escape('%'.$filter.'%')."
+			'lower(nachname) like '.$this->db->escape('%'.mb_strtolower($filter).'%')."
 			OR lower(vorname) like ".$this->db->escape('%'.$filter.'%')."
-			OR lower(nachname || ' ' || vorname) like ".$this->db->escape('%'.$filter.'%')."
-			OR lower(vorname || ' ' || nachname) like ".$this->db->escape('%'.$filter.'%')
+			OR lower(nachname || ' ' || vorname) like ".$this->db->escape('%'.mb_strtolower($filter).'%')."
+			OR lower(vorname || ' ' || nachname) like ".$this->db->escape('%'.mb_strtolower($filter).'%')
 		);
 
 		return $result;
@@ -423,4 +432,4 @@ class Person_model extends DB_Model
 			return success($result);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/application/models/ressource/Stundensatz_model.php b/application/models/ressource/Stundensatz_model.php
index 10f5a6aa1..9d41dfbd9 100644
--- a/application/models/ressource/Stundensatz_model.php
+++ b/application/models/ressource/Stundensatz_model.php
@@ -2,7 +2,7 @@
 
 class Stundensatz_model extends DB_Model
 {
-	
+
 	/**
 	 * Constructor
 	 */
@@ -42,4 +42,95 @@ class Stundensatz_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
-}
\ No newline at end of file
+
+	public function getStundensatzForMitarbeiter($person_id, $studiensemester_kurzbz)
+	{
+		$this->load->config('stv');
+
+		$useFixangestelltStundensatz = $this->config->item('tabs')['projektarbeit']['lvLektroinnenzuteilungFixangestelltStundensatz'];
+		$defaultStundensatz = $this->config->item('tabs')['projektarbeit']['defaultProjektbetreuerStundensatz'];
+
+		$stundensatz = '';
+
+		if(isset($person_id) && isset($studiensemester_kurzbz))
+		{
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+			$this->StudiensemesterModel->addSelect('start, ende');
+			$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
+
+			if (hasData($result))
+			{
+				$studiensemester = getData($result)[0];
+
+				if (isset($useFixangestelltStundensatz) && !$useFixangestelltStundensatz)
+				{
+					// load Mitarbeiter
+					$params = [$person_id];
+					$qry = "
+						SELECT
+							mitarbeiter_uid, fixangestellt
+						FROM
+							public.tbl_mitarbeiter
+							JOIN public.tbl_benutzer ON(tbl_benutzer.uid=tbl_mitarbeiter.mitarbeiter_uid)
+						WHERE
+							person_id=?
+						ORDER BY
+							tbl_mitarbeiter.insertamum DESC NULLS LAST
+						LIMIT 1";
+
+					$result = $this->execQuery($qry, $params);
+
+					if (hasData($result))
+					{
+						foreach (getData($result) as $ma)
+						{
+							if (!$ma->fixangestellt)
+							{
+								$stundensatzRes = $this->getStundensatzByDatum(
+									$ma->mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'lehre'
+								);
+
+								if (hasData($stundensatzRes))
+									$stundensatz = getData($stundensatzRes)[0]->stundensatz;
+								else
+									$stundensatz = '0.00';
+							}
+						}
+					}
+					else
+					{
+						$stundensatz = '0.00';
+					}
+
+				}
+				else
+				{
+					$params = [$person_id, $studiensemester->ende, $studiensemester->start];
+					$qry = "SELECT ss.stundensatz
+							FROM hr.tbl_stundensatz ss
+								JOIN public.tbl_mitarbeiter ON ss.uid = tbl_mitarbeiter.mitarbeiter_uid
+								JOIN public.tbl_benutzer ON(tbl_benutzer.uid=tbl_mitarbeiter.mitarbeiter_uid)
+							WHERE person_id=?
+								AND stundensatztyp = 'lehre'
+								AND gueltig_von <= ?
+								AND (gueltig_bis >= ? OR gueltig_bis IS NULL)
+							ORDER BY gueltig_bis DESC NULLS FIRST, gueltig_von DESC NULLS LAST LIMIT 1";
+
+					$result = $this->execQuery($qry, $params);
+
+					if (hasData($result))
+					{
+						$stundensatz = getData($result)[0]->stundensatz;
+					}
+					else
+					{
+						$stundensatz = $defaultStundensatz;
+					}
+				}
+			}
+		}
+
+		return $stundensatz;
+	}
+}
diff --git a/public/js/api/factory/stv/projektbetreuer.js b/public/js/api/factory/stv/projektbetreuer.js
new file mode 100644
index 000000000..fc710fe81
--- /dev/null
+++ b/public/js/api/factory/stv/projektbetreuer.js
@@ -0,0 +1,73 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getProjektbetreuer(projektarbeit_id ) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektbetreuer/getProjektbetreuer',
+			params: { projektarbeit_id }
+		};
+	},
+	getBetreuerarten() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektbetreuer/getBetreuerarten'
+		};
+	},
+	getDefaultStundensaetze(person_id, studiensemester_kurzbz) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektbetreuer/getDefaultStundensaetze',
+			params: { person_id, studiensemester_kurzbz }
+		};
+	},
+	getNoten() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektbetreuer/getNoten'
+		};
+	},
+	saveProjektbetreuer(projektarbeit_id, projektbetreuerListe) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/projektbetreuer/saveProjektbetreuer',
+			params: { projektarbeit_id, projektbetreuerListe }
+		};
+	},
+	deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/projektbetreuer/deleteProjektbetreuer',
+			params: { projektarbeit_id, person_id, betreuerart_kurzbz }
+		};
+	},
+	getProjektbetreuerBySearchQuery(searchString) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektbetreuer/getProjektbetreuerBySearchQuery',
+			params: { searchString }
+		};
+	},
+	validateProjektbetreuer(projektbetreuer) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/projektbetreuer/validateProjektbetreuer',
+			params: { projektbetreuer }
+		};
+	}
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Betreuung.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Betreuung.js
deleted file mode 100644
index 5d223d694..000000000
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Betreuung.js
+++ /dev/null
@@ -1,847 +0,0 @@
-import {CoreFilterCmpt} from "../../../../filter/Filter.js";
-import FormForm from '../../../../Form/Form.js';
-import FormInput from '../../../../Form/Input.js';
-import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
-
-import ApiStvAbschlusspruefung from '../../../../../api/factory/stv/abschlusspruefung.js';
-
-export default {
-	components: {
-		CoreFilterCmpt,
-		BsModal,
-		FormForm,
-		FormInput,
-		PvAutoComplete,
-		AbschlusspruefungDropdown,
-		PruefungList
-	},
-	inject: {
-		cisRoot: {
-			from: 'cisRoot'
-		},
-		config: {
-			from: 'config',
-			required: true
-		},
-		$reloadList: {
-			from: '$reloadList',
-			required: true
-		},
-		isBerechtigtDocAndOdt: {
-			from: 'hasPermissionOutputformat',
-			default: false
-		}
-	},
-	computed: {
-		studentUids() {
-			if (this.student.uid)
-			{
-				return [this.student.uid];
-			}
-			return this.student.map(e => e.uid);
-		},
-		studentKzs(){
-			if (this.student.uid)
-			{
-				return [this.student.studiengang_kz];
-			}
-			return this.student.map(e => e.studiengang_kz);
-		},
-		stg_kz(){
-			return this.studentKzs[0];
-		},
-	},
-	props: {
-		student: Object
-	},
-	data() {
-		return {
-			tabulatorOptions: {
-				ajaxURL: 'dummy',
-				ajaxRequestFunc: () => this.$api.call(ApiStvAbschlusspruefung.getAbschlusspruefung(this.student.uid)),
-				ajaxResponse: (url, params, response) => response.data,
-				columns: [
-					{title: "vorsitz", field: "vorsitz_nachname"},
-					{title: "abschlussbeurteilung", field: "beurteilung_bezeichnung"},
-					{title: "prueferIn1", field: "p1_nachname", visible: false},
-					{title: "prueferIn2", field: "p2_nachname", visible: false},
-					{title: "prueferIn3", field: "p3_nachname", visible: false},
-					{
-						title: "datum", 
-						field: "datum",
-						formatter: function (cell) {
-							const dateStr = cell.getValue();
-							if (!dateStr) return "";
-
-							const date = new Date(dateStr);
-							return date.toLocaleString("de-DE", {
-								day: "2-digit",
-								month: "2-digit",
-								year: "numeric",
-								hour12: false
-							});
-						}
-					},
-					{title: "uhrzeit", field: "uhrzeit"},
-					{
-						title: "freigabe", 
-						field: "freigabedatum",
-						formatter: function (cell) {
-							const dateStr = cell.getValue();
-							if (!dateStr) return "";
-
-							const date = new Date(dateStr);
-							return date.toLocaleString("de-DE", {
-								day: "2-digit",
-								month: "2-digit",
-								year: "numeric",
-								hour12: false
-							});
-						}
-					},
-					{title: "pruefungsantritt", field: "antritt_bezeichnung"},
-					{
-						title: "sponsion", 
-						field: "sponsion",
-						formatter: function (cell) {
-							const dateStr = cell.getValue();
-							if (!dateStr) return "";
-
-							const date = new Date(dateStr);
-							return date.toLocaleString("de-DE", {
-								day: "2-digit",
-								month: "2-digit",
-								year: "numeric",
-								hour12: false
-							});
-						}
-					},
-					{title: "anmerkung", field: "anmerkung"},
-					{title: "abschlusspruefung_id", field: "abschlusspruefung_id", visible: false},
-					{title: "typ", field: "pruefungstyp_kurzbz", visible: false},
-
-					{
-						title: 'Aktionen', field: 'actions',
-						minWidth: 150, // Ensures Action-buttons will be always fully displayed
-						formatter: (cell, formatterParams, onRendered) => {
-							let container = document.createElement('div');
-							container.className = "d-flex gap-2";
-
-							let button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-edit"></i>';
-							button.title = this.$p.t('ui', 'bearbeiten');
-							button.addEventListener('click', (event) =>
-								this.actionEditAbschlusspruefung(cell.getData().abschlusspruefung_id)
-							);
-							container.append(button);
-
-							button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-xmark"></i>';
-							button.title = this.$p.t('ui', 'loeschen');
-							button.addEventListener('click', () =>
-								this.actionDeleteAbschlusspruefung(cell.getData().abschlusspruefung_id)
-							);
-							container.append(button);
-
-							container.append(cell.getData().actionDiv);
-
-							return container;
-						},
-						frozen: true
-					},
-				],
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData: false,
-				height: 'auto',
-				minHeight: '200',
-				selectable: true,
-				index: 'abschlusspruefung_id',
-				persistenceID: 'stv-details-finalexam'
-			},
-			tabulatorEvents: [
-				{
-					event: 'dataLoaded',
-					handler: data => this.tabulatorData = data.map(item => {
-						item.actionDiv = document.createElement('div');
-						return item;
-					}),
-				},
-				{
-					event: 'tableBuilt',
-					handler: async() => {
-						await this.$p.loadCategory(['global', 'person', 'stv', 'abschlusspruefung', 'ui']);
-
-
-						let cm = this.$refs.table.tabulator.columnManager;
-
-						cm.getColumnByField('vorsitz_nachname').component.updateDefinition({
-							title: this.$p.t('abschlusspruefung', 'vorsitz_header')
-						});
-						cm.getColumnByField('beurteilung_bezeichnung').component.updateDefinition({
-							title: this.$p.t('abschlusspruefung', 'abschlussbeurteilung')
-						});
-						cm.getColumnByField('p1_nachname').component.updateDefinition({
-							title: this.$p.t('abschlusspruefung', 'pruefer1')
-						});
-						cm.getColumnByField('p2_nachname').component.updateDefinition({
-							title: this.$p.t('abschlusspruefung', 'pruefer2')
-						});
-						cm.getColumnByField('p3_nachname').component.updateDefinition({
-							title: this.$p.t('abschlusspruefung', 'pruefer3')
-						});
-						cm.getColumnByField('datum').component.updateDefinition({
-							title: this.$p.t('global', 'datum')
-						});
-						cm.getColumnByField('uhrzeit').component.updateDefinition({
-							title: this.$p.t('global', 'uhrzeit')
-						});
-						cm.getColumnByField('freigabedatum').component.updateDefinition({
-							title: this.$p.t('abschlusspruefung', 'freigabe')
-						});
-						cm.getColumnByField('antritt_bezeichnung').component.updateDefinition({
-							title: this.$p.t('abschlusspruefung', 'pruefungsantritt')
-						});
-						cm.getColumnByField('sponsion').component.updateDefinition({
-							title: this.$p.t('abschlusspruefung', 'sponsion')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('pruefungstyp_kurzbz').component.updateDefinition({
-							title: this.$p.t('global', 'typ')
-						});
-						cm.getColumnByField('abschlusspruefung_id').component.updateDefinition({
-							title: this.$p.t('ui', 'abschlusspruefung_id')
-						});
-						/*
-						cm.getColumnByField('actions').component.updateDefinition({
-						title: this.$p.t('global', 'aktionen')
-												});
-						*/
-					}
-				}
-			],
-			tabulatorData: [],
-			lastSelected: null,
-			formData: {
-				typStg: null,
-				pruefungstyp_kurzbz: null,
-				akadgrad_id: null,
-				vorsitz: null,
-				pruefungsantritt_kurzbz: null,
-				abschlussbeurteilung_kurzbz: null,
-				datum: null,
-				sponsion: null,
-				pruefer1: null,
-				pruefer2: null,
-				pruefer3: null,
-				anmerkung: null,
-				protokoll: null,
-				note: null,
-				link: null
-			},
-			statusNew: true,
-			arrTypen: [],
-			arrAntritte: [],
-			arrBeurteilungen: [],
-			arrAkadGrad: [],
-			arrNoten: [],
-			filteredMitarbeiter: [],
-			filteredPruefer: [],
-			abortController: {
-				mitarbeiter: null,
-				pruefer: null
-			},
-			stgInfo: { typ: '', oe_kurzbz: '' }
-		}
-	},
-	watch: {
-		student(){
-			if (this.$refs.table) {
-				this.$refs.table.reloadTable();
-			}
-			this.getStudiengangByKz();
-		}
-	},
-	methods: {
-		getStudiengangByKz(){
-			this.stgInfo = { typ: '', oe_kurzbz: '' };
-			this.$api
-				.call(ApiStudiengang.getStudiengangByKz(this.stg_kz))
-				.then(result => this.stgInfo = result.data)
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		actionNewAbschlusspruefung() {
-			this.resetForm();
-			this.statusNew = true;
-			this.$refs.finalexamModal.show();
-			this.setDefaultFormData();
-		},
-		actionEditAbschlusspruefung(abschlusspruefung_id) {
-			this.resetForm();
-			this.statusNew = false;
-			this.$refs.finalexamModal.show();
-			this.loadAbschlusspruefung(abschlusspruefung_id);
-		},
-		actionDeleteAbschlusspruefung(abschlusspruefung_id) {
-			this.$fhcAlert
-				.confirmDelete()
-				.then(result => result
-					? abschlusspruefung_id
-					: Promise.reject({handled: true}))
-				.then(this.deleteAbschlusspruefung)
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		addNewAbschlusspruefung() {
-			const dataToSend = {
-				uid: this.student.uid,
-				formData: this.formData
-			};
-
-			return this.$refs.formFinalExam
-				.call(ApiStvAbschlusspruefung.addNewAbschlusspruefung(dataToSend))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('finalexamModal');
-					this.resetForm();
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					this.reload();
-				});
-		},
-		hideModal(modalRef){
-			this.$refs[modalRef].hide();
-		},
-		reload() {
-			this.$refs.table.reloadTable();
-		},
-		loadAbschlusspruefung(abschlusspruefung_id) {
-			return this.$api
-				.call(ApiStvAbschlusspruefung.loadAbschlusspruefung(abschlusspruefung_id))
-				.then(result => {
-					this.formData = result.data;
-					//TODO(Manu) check if cisRoot is okay
-					this.formData.link = this.cisRoot + 'index.ci.php/lehre/Pruefungsprotokoll/showProtokoll?abschlusspruefung_id=' + this.formData.abschlusspruefung_id + '&fhc_controller_id=67481e5ed5490';
-					return result;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		updateAbschlusspruefung(abschlusspruefung_id) {
-			const dataToSend = {
-				id: abschlusspruefung_id,
-				formData: this.formData
-			};
-			return this.$refs.formFinalExam
-				.call(ApiStvAbschlusspruefung.updateAbschlusspruefung(dataToSend))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('finalexamModal');
-					this.resetForm();
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					this.reload();
-				});
-		},
-		deleteAbschlusspruefung(abschlusspruefung_id) {
-			return this.$api
-				.call(ApiStvAbschlusspruefung.deleteAbschlusspruefung(abschlusspruefung_id))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					this.reload();
-				});
-		},
-		resetForm() {
-			this.formData.pruefungstyp_kurzbz = null;
-			this.formData.akadgrad_id = null;
-			this.formData.vorsitz = null;
-			this.formData.pruefungsantritt_kurzbz = null;
-			this.formData.abschlussbeurteilung_kurzbz = null;
-			this.formData.datum = null; //oder new Date();
-			this.formData.sponsion = null;
-			this.formData.pruefer1 = null;
-			this.formData.pruefer2 = null;
-			this.formData.pruefer3 = null;
-			this.formData.anmerkung = null;
-			this.formData.protokoll = null;
-			this.formData.note = null;
-			this.formData.p1 = null;
-			this.formData.p2 = null;
-			this.formData.p3 = null;
-			this.formData.pv = null;
-		},
-		search(event) {
-			if (this.abortController.mitarbeiter) {
-				this.abortController.mitarbeiter.abort();
-			}
-			this.abortController.mitarbeiter = new AbortController();
-
-			return this.$api
-				.call(ApiStvAbschlusspruefung.getMitarbeiter(event.query))
-				.then(result => {
-					this.filteredMitarbeiter = result.data.retval;
-				});
-		},
-		searchNotAkad(event) {
-			if (this.abortController.pruefer) {
-				this.abortController.pruefer.abort();
-			}
-			this.abortController.pruefer = new AbortController();
-
-			return this.$api
-				.call(ApiStvAbschlusspruefung.getPruefer(event.query))
-				.then(result => {
-					this.filteredPruefer = result.data.retval;
-				});
-		},
-		setDefaultFormData() {
-
-			this.resetForm();
-
-			if (this.stgInfo.typ === 'b') {
-				this.formData.pruefungstyp_kurzbz = 'Bachelor';
-				this.formData.protokoll = this.$p.t('abschlusspruefung', 'pruefungsnotizenMaster');
-			}
-			if (this.stgInfo.typ === 'd' || this.stgInfo === 'm') {
-				this.formData.pruefungstyp_kurzbz = 'Diplom';
-				this.formData.protokoll = this.$p.t('abschlusspruefung', 'pruefungsnotizenMaster');
-			}
-			if (this.stgInfo.typ === 'lg') {
-				this.formData.pruefungstyp_kurzbz = 'lgabschluss';
-			}
-
-			if (!this.formData.akadgrad_id && this.arrAkadGrad.length > 0) {
-				this.formData.akadgrad_id = this.arrAkadGrad[0].akadgrad_id;
-			}
-		},
-		printDocument(link) {
-			window.open(link, '_blank');
-		},
-	},
-	created() {
-		this.$api
-			.call(ApiStvAbschlusspruefung.getTypenAbschlusspruefung())
-			.then(result => {
-				this.arrTypen = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiStvAbschlusspruefung.getTypenAntritte())
-			.then(result => {
-				this.arrAntritte = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiStvAbschlusspruefung.getBeurteilungen())
-			.then(result => {
-				this.arrBeurteilungen = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiStvAbschlusspruefung.getNoten())
-			.then(result => {
-				this.arrNoten = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiStvAbschlusspruefung.getAkadGrade(this.student.studiengang_kz))
-			.then(result => {
-				this.arrAkadGrad = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-		if (!this.student.length) {
-			this.$api
-				.call(ApiStudiengang.getStudiengangByKz(this.student.studiengang_kz))
-				.then(result => {
-					this.stgInfo = result.data;
-					this.setDefaultFormData();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		} else
-			this.getStudiengangByKz();
-	},
-	template: `
-	<div class="stv-details-abschlusspruefung h-100 pb-3">
-		<h4>{{this.$p.t('stv','tab_finalexam')}}</h4>
-		
-		<div v-if="this.student.length">
-			<abschlusspruefung-dropdown
-				:showAllFormats="isBerechtigtDocAndOdt"
-				:studentUids="studentUids"
-				:showDropDownMulti="true"
-				:stgTyp="stgInfo.typ"
-				:stgKz="stg_kz"
-				:cisRoot="cisRoot"
-				@linkGenerated="printDocument"
-			></abschlusspruefung-dropdown>
-		</div>
-
-		<core-filter-cmpt
-			v-if="!this.student.length"
-			ref="table"
-			:tabulator-options="tabulatorOptions"
-			:tabulator-events="tabulatorEvents"
-			table-only
-			:side-menu="false"
-			reload
-			new-btn-show
-			:new-btn-label="this.$p.t('stv', 'tab_finalexam')"
-			@click:new="actionNewAbschlusspruefung"
-			>
-		</core-filter-cmpt>
-		
-		<!--Modal: finalexamModal-->
-		<bs-modal ref="finalexamModal" dialog-class="modal-xl modal-dialog-scrollable">
-			<template #title>
-				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('abschlusspruefung', 'abschluessPruefungAnlegen')}}</p>
-				<p v-else class="fw-bold mt-3">{{$p.t('abschlusspruefung', 'abschluessPruefungBearbeiten')}}</p>
-			</template>
-
-					<pruefung-list ref="pruefungList" :uid="student.uid"></pruefung-list>
-
-			<form-form v-if="!this.student.length" ref="formFinalExam" @submit.prevent>
-
-				<legend>{{this.$p.t('global','details')}}</legend>
-				<p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p>
-				<div class="row mb-3">
-					<form-input
-						container-class="col-6 stv-details-abschlusspruefung-typ"
-						:label="$p.t('global', 'typ')"
-						type="select"
-						v-model="formData.pruefungstyp_kurzbz"
-						name="pruefungstyp_kurzbz"
-						>
-						<option
-							v-for="typ in arrTypen"
-							:key="typ.pruefungstyp_kurzbz"
-							:value="typ.pruefungstyp_kurzbz"
-							>
-							{{typ.beschreibung}}
-						</option>
-					</form-input>
-					<form-input
-						container-class="col-6 stv-details-abschlusspruefung-note"
-						:label="$p.t('abschlusspruefung', 'notekommpruefung')"
-						type="select"
-						v-model="formData.note"
-						name="note"
-						>
-						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
-						<option
-							v-for="note in arrNoten"
-							:key="note.note"
-							:value="note.note"
-							>
-							{{note.bezeichnung}}
-						</option>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						container-class="col-6 stv-details-abschlusspruefung-pruefungsantritt"
-						:label="$p.t('abschlusspruefung', 'pruefungsantritt')"
-						type="select"
-						v-model="formData.pruefungsantritt_kurzbz"
-						name="pruefungsantritt_kurzbz"
-						>
-						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
-						<option
-							v-for="antritt in arrAntritte"
-							:key="antritt.pruefungsantritt_kurzbz"
-							:value="antritt.pruefungsantritt_kurzbz"
-							>
-							{{antritt.bezeichnung}}
-						</option>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.vorsitz"
-							name="vorsitz"
-							:suggestions="filteredMitarbeiter"
-							@complete="search"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.pv"
-							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
-							v-model="formData.pv"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.vorsitz"
-							name="vorsitz"
-							:suggestions="filteredMitarbeiter"
-							@complete="search"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
-							:label="$p.t('abschlusspruefung', 'pruefer1')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer1"
-							name="pruefer1"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.p1"
-							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'pruefer1')"
-							v-model="formData.p1"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
-							:label="$p.t('abschlusspruefung', 'pruefer1')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer1"
-							name="pruefer1"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-				</div>
-
-				<div class="row mb-3">
-
-					<form-input
-						container-class="col-6 stv-details-abschlusspruefung-abschlussbeurteilung_kurzbz"
-						:label="$p.t('abschlusspruefung', 'abschlussbeurteilung')"
-						type="select"
-						v-model="formData.abschlussbeurteilung_kurzbz"
-						name="abschlussbeurteilung_kurzbz"
-						>
-						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
-						<option
-							v-for="beurteilung in arrBeurteilungen"
-							:key="beurteilung.abschlussbeurteilung_kurzbz"
-							:value="beurteilung.abschlussbeurteilung_kurzbz"
-							>
-							{{beurteilung.bezeichnung}}
-						</option>
-					</form-input>
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
-							:label="$p.t('abschlusspruefung', 'pruefer2')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer2"
-							name="pruefer2"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.p2"
-							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'pruefer2')"
-							v-model="formData.p2"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
-							:label="$p.t('abschlusspruefung', 'pruefer2')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer2"
-							name="pruefer2"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						container-class="col-6 stv-details-abschlusspruefung-akadgrad"
-						:label="$p.t('abschlusspruefung', 'akadGrad')"
-						type="select"
-						v-model="formData.akadgrad_id"
-						name="akadgrad_id"
-						>
-						<option
-							v-for="grad in arrAkadGrad"
-							:key="grad.akadgrad_id"
-							:value="grad.akadgrad_id"
-							>
-							{{grad.titel}}
-						</option>
-					</form-input>
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-							:label="$p.t('abschlusspruefung', 'pruefer3')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer3"
-							name="pruefer3"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.p3"
-							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'pruefer3')"
-							v-model="formData.p3"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-							:label="$p.t('abschlusspruefung', 'pruefer3')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer3"
-							name="pruefer3"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						container-class="col-6 stv-details-abschlusspruefung-datum"
-						:label="$p.t('global', 'datum')"
-						type="DatePicker"
-						v-model="formData.datum"
-						auto-apply
-						:enable-time-picker="false"
-						format="dd.MM.yyyy"
-						name="datum"
-						:teleport="true"
-						>
-					</form-input>
-					<form-input
-						container-class="col-6 stv-details-abschlusspruefung-anmerkung"
-						:label="$p.t('global', 'anmerkung')"
-						type="textarea"
-						v-model="formData.anmerkung"
-						name="anmerkung"
-						>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						container-class="col-6 stv-details-abschlusspruefung-sponsion"
-						:label="$p.t('abschlusspruefung', 'sponsion')"
-						type="DatePicker"
-						v-model="formData.sponsion"
-						auto-apply
-						:enable-time-picker="false"
-						format="dd.MM.yyyy"
-						name="sponsion"
-						:teleport="true"
-						>
-					</form-input>
-					<form-input
-						container-class="col-6 stv-details-abschlusspruefung-protokoll"
-						:label="$p.t('abschlusspruefung', 'protokoll')"
-						type="textarea"
-						v-model="formData.protokoll"
-						name="protokoll"
-						:rows= 10
-						>
-					</form-input>
-				</div>
-
-				<div class="row mb-3 col-6">
-					<div class="col">
-						<p >{{$p.t('abschlusspruefung', 'zurBeurteilung')}}</p>
-					</div>
-					<div class="col">
-						<p>
-							<a :href="formData.link" target="_blank" rel="noopener noreferrer">
-								{{$p.t('abschlusspruefung', 'pruefungsprotokoll')}}
-							</a>
-						</p>
-					</div>
-				</div>
-
-			</form-form>
-
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
-					<button v-if="statusNew" class="btn btn-primary" @click="addNewAbschlusspruefung()"> {{$p.t('ui', 'speichern')}}</button>
-					<button v-else class="btn btn-primary" @click="updateAbschlusspruefung(formData.abschlusspruefung_id)"> {{$p.t('ui', 'speichern')}}</button>
-			</template>
-
-		</bs-modal>
-
-		<Teleport v-for="data in tabulatorData" :key="data.abschlusspruefung_id" :to="data.actionDiv">
-			<abschlusspruefung-dropdown
-				:showAllFormats="isBerechtigtDocAndOdt"
-				:showDropDownMulti="false"
-				:abschlusspruefung_id="data.abschlusspruefung_id"
-				:studentUids="data.student_uid"
-				:stgPrfgTyp="data.pruefungstyp_kurzbz"
-				:stgKz="stg_kz"
-				:cisRoot="cisRoot"
-				@linkGenerated="printDocument"
-			></abschlusspruefung-dropdown>
-		</Teleport>		
-	</div>
-`
-}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index a6256ceb1..7f98948d4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -1,4 +1,3 @@
-import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
@@ -7,7 +6,6 @@ import ApiStvProjektarbeit from '../../../../../api/factory/stv/projektarbeit.js
 
 export default {
 	components: {
-		CoreFilterCmpt,
 		FormForm,
 		FormInput,
 		PvAutoComplete
@@ -48,23 +46,12 @@ export default {
 			}
 
 			return lehreinheiten;
-		},
-		//~ preparedFormData() {
-			//~ console.log("FOR DATA CALLEd");
-			//~ if (this.formData.projektarbeit_id == null) delete(this.formData.projektarbeit_id);
-			//~ if (this.formData.firma) this.formData.firma_id = this.formData.firma.firma_id;
-			//~ delete(this.formData.firma);
-			//~ delete(this.formData.firma_name);
-			//~ delete(this.formData.lehrveranstaltung_id);
-			//~ // convert null value fields from string to null
-			//~ return this.formData;
-		//~ }
+		}
 	},
 	props: {
 		statusNew: Boolean,
 		student: Object,
-		projektarbeit: Object,
-		stg_kz: Number
+		projektarbeit: Object
 	},
 	data() {
 		return {
@@ -177,21 +164,13 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		setFormData(arrTypen, arrLvs, arrNoten, projektarbeitData) {
-			this.arrTypen = arrTypen;
-			this.arrLvs = arrLvs;
-			this.arrNoten = arrNoten;
-			if (projektarbeitData) {
-				projektarbeitData.firma = {firma_id: projektarbeitData.firma_id, name: projektarbeitData.firma_name};
-				this.formData = projektarbeitData;
-			}
-		},
 		loadProjektarbeit(projektarbeit_id) {
 
 			return this.$api
 				.call(ApiStvProjektarbeit.loadProjektarbeit(projektarbeit_id))
 				.then(result => {
 					this.formData = result.data;
+					if (this.formData.firma_id) this.formData.firma = {firma_id: this.formData.firma_id, name: this.formData.firma_name};
 					return result;
 				})
 				.catch(this.$fhcAlert.handleSystemError)
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 034b3fd6c..15c9aeeee 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -7,6 +7,7 @@ import PvAutoComplete from "../../../../../../../index.ci.php/public/js/componen
 
 import ApiStvProjektarbeit from '../../../../../api/factory/stv/projektarbeit.js';
 import ProjektarbeitDetails from "./Details.js";
+import Projektbetreuer from "./Projektbetreuer.js";
 
 export default {
 	components: {
@@ -15,7 +16,8 @@ export default {
 		FormForm,
 		FormInput,
 		PvAutoComplete,
-		ProjektarbeitDetails
+		ProjektarbeitDetails,
+		Projektbetreuer
 	},
 	inject: {
 		cisRoot: {
@@ -174,7 +176,9 @@ export default {
 							button.title = this.$p.t('ui', 'bearbeiten');
 							button.addEventListener('click', (event) => {
 								let data = cell.getData();
-								this.actionEditProjektarbeit(data.projektarbeit_id, data.studiensemester_kurzbz, data.lehrveranstaltung_id);
+								this.actionEditProjektarbeit(
+									data.projektarbeit_id, data.studiensemester_kurzbz, data.lehrveranstaltung_id, data.projekttyp_kurzbz
+								);
 							});
 							container.append(button);
 
@@ -195,7 +199,6 @@ export default {
 					},
 				],
 				layout: 'fitDataFill',
-				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: '200',
 				selectable: 1,
@@ -240,25 +243,20 @@ export default {
 			lehrveranstaltung_id: null
 		}
 	},
-	//~ watch: {
-		//~ student(){
-			//~ if (this.$refs.table) {
-				//~ this.$refs.table.reloadTable();
-			//~ }
-			//~ this.getStudiengangByKz();
-		//~ }
-	//~ },
 	methods: {
 		actionNewProjektarbeit() {
 			this.statusNew = true;
 			this.$refs.projektarbeitDetails.resetForm();
 			this.$refs.projektarbeitDetails.getFormData();
+			this.$refs.projektbetreuer.getData();
 			this.$refs.projektarbeitModal.show();
 		},
-		actionEditProjektarbeit(projektarbeit_id, studiensemester_kurzbz, lehrveranstaltung_id) {
+		actionEditProjektarbeit(projektarbeit_id, studiensemester_kurzbz, lehrveranstaltung_id, projekttyp_kurzbz) {
 			this.statusNew = false;
 			this.$refs.projektarbeitDetails.getFormData(this.statusNew, studiensemester_kurzbz, lehrveranstaltung_id);
+			// TODO: maybe preload projektarbeit? not just on edit?
 			this.$refs.projektarbeitDetails.loadProjektarbeit(projektarbeit_id);
+			this.$refs.projektbetreuer.getData(projektarbeit_id, studiensemester_kurzbz, projekttyp_kurzbz);
 			this.$refs.projektarbeitModal.show();
 		},
 		actionDeleteProjektarbeit(projektarbeit_id) {
@@ -271,41 +269,41 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		addNewProjektarbeit() {
-			Promise.allSettled([
-				this.$refs.projektarbeitDetails.addNewProjektarbeit()
-			]).then((results) => {
-				let hasError = false;
-				results.forEach((promise_result) => {
+			this.$refs.projektbetreuer.validateProjektbetreuer()
+				.then(() => {
+					return this.$refs.projektarbeitDetails.addNewProjektarbeit();
+				})
+				.then((result) => {
+					const projektarbeit_id = result.data;
+					console.log(projektarbeit_id);
 
-					if (!(promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success")) {
-
-						hasError = true;
+					if (!isNaN(projektarbeit_id)) {
+						return this.$refs.projektbetreuer.saveProjektbetreuer(projektarbeit_id);
 					}
-				});
-
-				if (!hasError) {
+				})
+				.then((result) => {
+					console.log(result);
 					this.projektarbeitSaved();
-				}
-			});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateProjektarbeit() {
-			Promise.allSettled(
-			[
-				this.$refs.projektarbeitDetails.updateProjektarbeit()
-			]).then((results) => {
-				let hasError = false;
-				results.forEach((promise_result) => {
+			this.$refs.projektbetreuer.validateProjektbetreuer()
+				.then(() => {
+					return this.$refs.projektarbeitDetails.updateProjektarbeit();
+				})
+				.then((result) => {
+					const projektarbeit_id = result.data;
+					console.log(projektarbeit_id);
 
-					if (!(promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success")) {
-
-						hasError = true;
+					if (!isNaN(projektarbeit_id)) {
+						return this.$refs.projektbetreuer.saveProjektbetreuer(projektarbeit_id);
 					}
-				});
-
-				if (!hasError) {
+				})
+				.then((result) => {
 					this.projektarbeitSaved();
-				}
-			});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteProjektarbeit(projektarbeit_id) {
 			return this.$api
@@ -325,7 +323,6 @@ export default {
 			this.$refs.projektarbeitDetails.resetForm();
 		},
 		rowSelectionChanged(data) {
-			console.log("selection changed");
 			this.lastSelected = data.length > 0 ? data[0] : null;
 		},
 		hideModal(modalRef){
@@ -362,7 +359,14 @@ export default {
 				<p v-else class="fw-bold mt-3">{{$p.t('projektarbeit', 'projektarbeitBearbeiten')}}</p>
 			</template>
 
-			<projektarbeit-details ref="projektarbeitDetails" :student="student" :stg_kz="stg_kz"></projektarbeit-details>
+			<div class="row">
+				<div class="col-6">
+					<projektarbeit-details ref="projektarbeitDetails" :student="student"></projektarbeit-details>
+				</div>
+				<div class="col-6">
+					<projektbetreuer ref="projektbetreuer" :config="config"></projektbetreuer>
+				</div>
+			</div>
 
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
new file mode 100644
index 000000000..0af3729cd
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -0,0 +1,421 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
+import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+
+import ApiStvProjektbetreuer from '../../../../../api/factory/stv/projektbetreuer.js';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		FormForm,
+		FormInput,
+		PvAutoComplete
+	},
+	inject: {
+	},
+	computed: {
+	},
+	props: {
+		config: {
+			type: Object,
+			default: {}
+		}
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				columns: [
+					{title: "Nachname", field: "nachname"},
+					{title: "Vorname", field: "vorname"},
+					{title: "Note", field: "note"},
+					{title: "Punkte", field: "punkte"},
+					{title: "Stunden", field: "stunden"},
+					{title: "Stundensatz", field: "stundensatz", visible: false},
+					{title: "Art", field: "betreuerart_kurzbz", visible: false},
+					{title: "Person ID", field: "person_id", visible: false},
+					{title: "Vertrag ID", field: "vertrag_id", visible: false},
+					{title: "Projektarbeit ID", field: "projektarbeit_id", visible: false},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = this.$p.t('ui', 'bearbeiten');
+							button.addEventListener('click', (event) => {
+								let data = cell.getData();
+								this.actionEditProjektbetreuer(data.projektarbeit_id, data.person_id, data.betreuerart_kurzbz);
+							});
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = this.$p.t('ui', 'loeschen');
+							button.addEventListener('click', () => {
+								const data = cell.getData();
+								this.actionDeleteProjektbetreuer(data.betreuer_id, data.projektarbeit_id, data.person_id, data.betreuerart_kurzbz)
+							});
+							container.append(button);
+
+							//container.append(cell.getData().actionDiv);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				minHeight: '100',
+				selectable: true,
+				selectable: 1,
+				index: 'betreuer_id',
+				persistenceID: 'stv-details-projektbetreuer'
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'person', 'stv', 'projektarbeit', 'ui']);
+					}
+				}
+			],
+			formData: {
+				betreuerart_kurzbz: null,
+				note: null,
+				stunden: null,
+				stundensatz: null
+			},
+			initialFormData: null,
+			defaultFormDataValues: {stunden: null, stundensatz: null},
+			projektarbeit_id: null,
+			statusNew: true,
+			editedBetreuerIdx: -1,
+			arrBetreuerart: [],
+			arrNoten: [],
+			filteredBetreuer: [],
+			autocompleteSelectedBetreuer: null,
+			abortController: {
+				betreuer: null
+			}
+		}
+	},
+	methods: {
+		actionNewProjektbetreuer() {
+			this.resetForm();
+			this.statusNew = true;
+			this.captureFormData();
+		},
+		actionEditProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
+
+			this.$api
+				.call(ApiStvProjektbetreuer.getDefaultStundensaetze(person_id, this.studiensemester_kurzbz))
+				.then(result => {
+					this.resetForm();
+					this.statusNew = false;
+					let projektbetreuerListe = this.$refs.table.tabulator.getData();
+					const idx = projektbetreuerListe.findIndex(
+							betr =>
+								betr.person_id === person_id &&
+								betr.projektarbeit_id === projektarbeit_id &&
+								betr.betreuerart_kurzbz === betreuerart_kurzbz
+						);
+
+					let betreuer = [];
+					if (idx >= 0) {
+						betreuer = projektbetreuerListe[idx];
+						this.formData = betreuer;
+						this.autocompleteSelectedBetreuer = {
+							person_id: this.formData.person_id,
+							name: this.formData.name,
+							vorname: this.formData.vorname,
+							nachname: this.formData.nachname
+						};
+					}
+					if (this.formData.stundensatz == null) this.formData.stundensatz = result.data;
+					this.captureFormData();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		actionDeleteProjektbetreuer(betreuer_id, projektarbeit_id, person_id, betreuerart_kurzbz) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? {projektarbeit_id, person_id, betreuerart_kurzbz}
+					: Promise.reject({handled: true}))
+				.then(result => {
+					return this.deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz)
+				})
+				.then(result => {
+					this.$refs.table.tabulator.deleteRow(betreuer_id);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		getData(projektarbeit_id, studiensemester_kurzbz, projekttyp_kurzbz) {
+
+			console.log(projekttyp_kurzbz);
+
+			this.studiensemester_kurzbz = studiensemester_kurzbz;
+
+			this.defaultFormDataValues.stunden = '0.0';
+			if (projekttyp_kurzbz == 'Bachelor') this.defaultFormDataValues.stunden = this.config.defaultProjektbetreuerStunden;
+			if (projekttyp_kurzbz == 'Diplom') this.defaultFormDataValues.stunden = this.config.defaultProjektbetreuerStundenDiplom;
+			this.defaultFormDataValues.stundensatz = this.config.defaultProjektbetreuerStundensatz;
+
+			this.$api
+				.call(ApiStvProjektbetreuer.getBetreuerarten())
+				.then(result => {
+					this.arrBetreuerart = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
+			this.$api
+				.call(ApiStvProjektbetreuer.getNoten())
+				.then(result => {
+					this.arrNoten = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
+			if (projektarbeit_id) {
+				this.projektarbeit_id = projektarbeit_id;
+				this.$api
+					.call(ApiStvProjektbetreuer.getProjektbetreuer(projektarbeit_id))
+					.then(result => {
+						this.$refs.table.tabulator.setData(this.addIds(result.data));
+						this.resetForm();
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			} else {
+				this.$refs.table.tabulator.setData([]);
+				this.resetForm();
+			}
+		},
+		confirmProjektbetreuer() {
+			if (!this.formDataModified()) return;
+
+			if (this.statusNew) {
+				this.formData.betreuer_id = this.getNewBetreuerId();
+				this.$refs.table.tabulator.addData(this.addAutoCompleteBetreuerToFormData(this.formData));
+			} else {
+				this.$refs.table.tabulator.updateData([this.formData]);
+				this.statusNew = true;
+			}
+		},
+		confirmProjektbetreuerAfterValidation() {
+			if (!this.formDataModified()) return;
+
+			this.validateProjektbetreuer()
+				.then(result => {
+					this.confirmProjektbetreuer();
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		saveProjektbetreuer(projektarbeit_id) {
+			this.confirmProjektbetreuer();
+			return this.$refs.formProjektbetreuer.call(
+				ApiStvProjektbetreuer.saveProjektbetreuer(projektarbeit_id, this.$refs.table.tabulator.getData())
+			);
+		},
+		deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
+			return this.$api
+				.call(ApiStvProjektbetreuer.deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+		},
+		searchBetreuer(event) {
+			if (this.abortController.betreuer) {
+				this.abortController.betreuer.abort();
+			}
+			this.abortController.betreuer = new AbortController();
+
+			return this.$api
+				.call(ApiStvProjektbetreuer.getProjektbetreuerBySearchQuery(event.query))
+				.then(result => {
+					this.filteredBetreuer = result.data;
+				});
+		},
+		validateProjektbetreuer() {
+			let alleBetreuer = this.$refs.table.tabulator.getData();
+
+			if (this.formDataModified()) {
+				alleBetreuer.push(this.addAutoCompleteBetreuerToFormData(this.formData));
+			}
+
+			return this.$api.call(ApiStvProjektbetreuer.validateProjektbetreuer(alleBetreuer));
+		},
+		resetForm() {
+			this.formData = this.getDefaultFormData();
+			this.autocompleteSelectedBetreuer = null;
+			this.initialFormData = null;
+		},
+		getDefaultFormData() {
+			let formData = {betreuerart_kurzbz : null, note: null};
+
+			for (const name in this.defaultFormDataValues) {
+				formData[name] = this.defaultFormDataValues[name];
+			}
+
+			return formData;
+		},
+		captureFormData() {
+			this.initialFormData = JSON.parse(JSON.stringify(this.formData)); // deep copy
+		},
+		addIds(betreuerListe) {
+
+			for (const idx in betreuerListe) {
+				let betreuer = betreuerListe[idx];
+
+				betreuer.person_id_old = betreuer.person_id;
+				betreuer.betreuerart_kurzbz_old = betreuer.betreuerart_kurzbz;
+				betreuer.betreuer_id = parseInt(idx);
+			}
+			return betreuerListe;
+		},
+		addAutoCompleteBetreuerToFormData() {
+			let preparedFormData = this.formData;
+
+			preparedFormData.projektarbeit_id = this.projektarbeit_id;
+			if (this.autocompleteSelectedBetreuer) {
+				preparedFormData.person_id = this.autocompleteSelectedBetreuer.person_id;
+				preparedFormData.name = this.autocompleteSelectedBetreuer.name;
+				preparedFormData.vorname = this.autocompleteSelectedBetreuer.vorname;
+				preparedFormData.nachname = this.autocompleteSelectedBetreuer.nachname;
+			}
+
+			return preparedFormData;
+		},
+		getNewBetreuerId() {
+			let max = 0;
+
+			for (const betreuer of this.$refs.table.tabulator.getData()) {
+				console.log(typeof betreuer.betreuer_id);
+				if (betreuer.betreuer_id > max) max = betreuer.betreuer_id;
+			}
+
+			return max + 1;
+		},
+		formDataModified() {
+			if (this.autocompleteSelectedBetreuer != null) return true;
+
+			console.log(this.formData);
+			console.log(this.initialFormData);
+
+			for (const prop in this.initialFormData) {
+				if (typeof this.formData[prop] == 'undefined') return true;
+				if (this.formData[prop] != this.initialFormData[prop]) return true;
+			}
+
+			return false;
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	template: `
+	<div class="stv-details-projektbetreuer h-100 pb-3">
+
+		<legend>{{this.$p.t('stv','betreuer')}}</legend>
+		<!-- <p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p> -->
+
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			new-btn-show
+			:new-btn-label="this.$p.t('stv', 'betreuer')"
+			@click:new="actionNewProjektbetreuer"
+			>
+		</core-filter-cmpt>
+
+		<form-form ref="formProjektbetreuer" @submit.prevent>
+			<div class="row mb-3">
+				<form-input
+					container-class="stv-details-projektarbeit-betreuer"
+					:label="$p.t('projektarbeit', 'betreuer')"
+					type="autocomplete"
+					optionLabel="name"
+					v-model="autocompleteSelectedBetreuer"
+					name="betreuer"
+					:suggestions="filteredBetreuer"
+					@complete="searchBetreuer"
+					:min-length="3"
+					>
+				</form-input>
+			</div>
+
+			<div class="row mb-3">
+				<form-input
+					container-class="col-6 stv-details-projektbetreuer-betreuerart"
+					:label="$p.t('global', 'betreuer')"
+					type="select"
+					v-model="formData.betreuerart_kurzbz"
+					name="betreuerart_kurzbz"
+					>
+					<option
+						v-for="art in arrBetreuerart"
+						:key="art.betreuerart_kurzbz"
+						:value="art.betreuerart_kurzbz"
+						>
+						{{art.beschreibung}}
+					</option>
+				</form-input>
+			</div>
+
+			<div class="row mb-3">
+					<form-input
+						container-class="col-8 stv-details-projektbetreuer-note"
+						:label="$p.t('projektarbeit', 'note')"
+						type="select"
+						v-model="formData.note"
+						name="note"
+						>
+						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+						<option
+							v-for="note in arrNoten"
+							:key="note.note"
+							:value="note.note"
+							>
+							{{note.bezeichnung}}
+						</option>
+					</form-input>
+			</div>
+
+			<div class="row mb-3">
+				<form-input
+					container-class="stv-details-projektarbeit-stunden"
+					type="text"
+					name="stunden"
+					:label="$p.t('projektarbeit', 'stunden')"
+					v-model="formData.stunden"
+					>
+				</form-input>
+			</div>
+
+			<div class="row mb-3">
+				<form-input
+					container-class="stv-details-projektarbeit-stundensatz"
+					type="text"
+					name="stundensatz"
+					:label="$p.t('projektarbeit', 'stundensatz')"
+					v-model="formData.stundensatz"
+					>
+				</form-input>
+			</div>
+
+		</form-form>
+		<button class="btn btn-primary" @click="confirmProjektbetreuerAfterValidation">{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}</button>
+	</div>
+`
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index fc76b3147..ee7b52b12 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25025,7 +25025,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'The Field {Field} must contain only numbers.',
+				'text' => 'The Field {field} must contain only numbers.',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 4cf2ef2927ca3c9108100798d9aca63e1fb93e4d Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 16 May 2025 13:40:47 +0200
Subject: [PATCH 003/101] removed console logs

---
 .../Details/Projektarbeit/Projektbetreuer.js                | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 0af3729cd..e1a06cb23 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -160,8 +160,6 @@ export default {
 		},
 		getData(projektarbeit_id, studiensemester_kurzbz, projekttyp_kurzbz) {
 
-			console.log(projekttyp_kurzbz);
-
 			this.studiensemester_kurzbz = studiensemester_kurzbz;
 
 			this.defaultFormDataValues.stunden = '0.0';
@@ -298,7 +296,6 @@ export default {
 			let max = 0;
 
 			for (const betreuer of this.$refs.table.tabulator.getData()) {
-				console.log(typeof betreuer.betreuer_id);
 				if (betreuer.betreuer_id > max) max = betreuer.betreuer_id;
 			}
 
@@ -307,9 +304,6 @@ export default {
 		formDataModified() {
 			if (this.autocompleteSelectedBetreuer != null) return true;
 
-			console.log(this.formData);
-			console.log(this.initialFormData);
-
 			for (const prop in this.initialFormData) {
 				if (typeof this.formData[prop] == 'undefined') return true;
 				if (this.formData[prop] != this.initialFormData[prop]) return true;

From 168e2890c710fc4f0948c6484a7a3b7febfcadf4 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sun, 18 May 2025 15:55:43 +0200
Subject: [PATCH 004/101] Studierendenverwaltung Projektarbeit: set default
 stunden value, correct lvs when new Projektarbeit, Projektarbetreuer form
 hidden by default

---
 .../api/frontend/v1/stv/Projektbetreuer.php   |  3 +-
 .../Details/Projektarbeit/Details.js          | 16 ++++-----
 .../Details/Projektarbeit/Projektarbeit.js    | 11 +++---
 .../Details/Projektarbeit/Projektbetreuer.js  | 34 +++++++++++++------
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index ac6663132..58b963ede 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -48,7 +48,8 @@ class Projektbetreuer extends FHCAPI_Controller
 		if (!isset($projektarbeit_id)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
 
 		$this->ProjektbetreuerModel->addSelect(
-			'projektarbeit_id, person_id, nachname, vorname, note, punkte, stunden, stundensatz, betreuerart_kurzbz, vertrag_id, titelpre, titelpost'
+			'projektarbeit_id, person_id, nachname, vorname, note, punkte, round(stunden, 1) AS stunden,
+			stundensatz, betreuerart_kurzbz, vertrag_id, titelpre, titelpost'
 		);
 		$this->ProjektbetreuerModel-> addSelect("CASE
 				WHEN EXISTS
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index 7f98948d4..b384196d8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -10,7 +10,7 @@ export default {
 		FormInput,
 		PvAutoComplete
 	},
-	emits: ['details-saved'],
+	emits: ['projekttypChanged'],
 	inject: {
 		defaultSemester: {
 			from: 'defaultSemester'
@@ -82,6 +82,11 @@ export default {
 			}
 		}
 	},
+	watch: {
+		'formData.projekttyp_kurzbz'(newValue, oldValue) {
+			this.$emit('projekttypChanged', newValue);
+		}
+	},
 	methods: {
 		resetForm() {
 			this.formData.projektarbeit_id = null;
@@ -284,15 +289,6 @@ export default {
 
 
 				<div class="row mb-3">
-					<!-- <form-input
-						v-if= "formData.firma_name"
-						container-class="col-6 stv-details-projektarbeit-firma"
-						type="text"
-						name="name"
-						:label="$p.t('projektarbeit', 'firma')"
-						v-model="formData.firma_name"
-						>
-					</form-input> -->
 					<form-input
 						container-class="stv-details-projektarbeit-firma"
 						:label="$p.t('projektarbeit', 'firma')"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 15c9aeeee..5124a2ef6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -247,7 +247,7 @@ export default {
 		actionNewProjektarbeit() {
 			this.statusNew = true;
 			this.$refs.projektarbeitDetails.resetForm();
-			this.$refs.projektarbeitDetails.getFormData();
+			this.$refs.projektarbeitDetails.getFormData(this.statusNew);
 			this.$refs.projektbetreuer.getData();
 			this.$refs.projektarbeitModal.show();
 		},
@@ -275,14 +275,12 @@ export default {
 				})
 				.then((result) => {
 					const projektarbeit_id = result.data;
-					console.log(projektarbeit_id);
 
 					if (!isNaN(projektarbeit_id)) {
 						return this.$refs.projektbetreuer.saveProjektbetreuer(projektarbeit_id);
 					}
 				})
 				.then((result) => {
-					console.log(result);
 					this.projektarbeitSaved();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -294,7 +292,6 @@ export default {
 				})
 				.then((result) => {
 					const projektarbeit_id = result.data;
-					console.log(projektarbeit_id);
 
 					if (!isNaN(projektarbeit_id)) {
 						return this.$refs.projektbetreuer.saveProjektbetreuer(projektarbeit_id);
@@ -325,6 +322,9 @@ export default {
 		rowSelectionChanged(data) {
 			this.lastSelected = data.length > 0 ? data[0] : null;
 		},
+		setDefaultStunden(projekttyp_kurzbz) {
+			this.$refs.projektbetreuer.setDefaultStunden(projekttyp_kurzbz);
+		},
 		hideModal(modalRef){
 			this.$refs[modalRef].hide();
 		},
@@ -361,7 +361,8 @@ export default {
 
 			<div class="row">
 				<div class="col-6">
-					<projektarbeit-details ref="projektarbeitDetails" :student="student"></projektarbeit-details>
+					<projektarbeit-details ref="projektarbeitDetails" :student="student" @projekttyp-changed="setDefaultStunden">
+					</projektarbeit-details>
 				</div>
 				<div class="col-6">
 					<projektbetreuer ref="projektbetreuer" :config="config"></projektbetreuer>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index e1a06cb23..ea8dba94f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -93,6 +93,7 @@ export default {
 				stunden: null,
 				stundensatz: null
 			},
+			editMode: false,
 			initialFormData: null,
 			defaultFormDataValues: {stunden: null, stundensatz: null},
 			projektarbeit_id: null,
@@ -111,15 +112,17 @@ export default {
 		actionNewProjektbetreuer() {
 			this.resetForm();
 			this.statusNew = true;
+			this.editMode = !this.editMode;
 			this.captureFormData();
 		},
 		actionEditProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
 
+			this.statusNew = false;
+			this.editMode = true;
 			this.$api
 				.call(ApiStvProjektbetreuer.getDefaultStundensaetze(person_id, this.studiensemester_kurzbz))
 				.then(result => {
 					this.resetForm();
-					this.statusNew = false;
 					let projektbetreuerListe = this.$refs.table.tabulator.getData();
 					const idx = projektbetreuerListe.findIndex(
 							betr =>
@@ -162,9 +165,7 @@ export default {
 
 			this.studiensemester_kurzbz = studiensemester_kurzbz;
 
-			this.defaultFormDataValues.stunden = '0.0';
-			if (projekttyp_kurzbz == 'Bachelor') this.defaultFormDataValues.stunden = this.config.defaultProjektbetreuerStunden;
-			if (projekttyp_kurzbz == 'Diplom') this.defaultFormDataValues.stunden = this.config.defaultProjektbetreuerStundenDiplom;
+			this.defaultFormDataValues.stunden = this.getDefaultStunden(projekttyp_kurzbz);
 			this.defaultFormDataValues.stundensatz = this.config.defaultProjektbetreuerStundensatz;
 
 			this.$api
@@ -196,18 +197,20 @@ export default {
 			}
 		},
 		confirmProjektbetreuer() {
-			if (!this.formDataModified()) return;
+			if (!this.editMode) return;
 
-			if (this.statusNew) {
+			if (typeof this.formData.betreuer_id == 'undefined') {
 				this.formData.betreuer_id = this.getNewBetreuerId();
 				this.$refs.table.tabulator.addData(this.addAutoCompleteBetreuerToFormData(this.formData));
 			} else {
 				this.$refs.table.tabulator.updateData([this.formData]);
 				this.statusNew = true;
 			}
+
+			this.editMode = false;
 		},
 		confirmProjektbetreuerAfterValidation() {
-			if (!this.formDataModified()) return;
+			//if (!this.formDataModified()) return;
 
 			this.validateProjektbetreuer()
 				.then(result => {
@@ -245,7 +248,7 @@ export default {
 		validateProjektbetreuer() {
 			let alleBetreuer = this.$refs.table.tabulator.getData();
 
-			if (this.formDataModified()) {
+			if (this.editMode) {
 				alleBetreuer.push(this.addAutoCompleteBetreuerToFormData(this.formData));
 			}
 
@@ -255,6 +258,7 @@ export default {
 			this.formData = this.getDefaultFormData();
 			this.autocompleteSelectedBetreuer = null;
 			this.initialFormData = null;
+			if (this.projekttyp_kurzbz) this.setDefaultStunden(this.projekttyp_kurzbz);
 		},
 		getDefaultFormData() {
 			let formData = {betreuerart_kurzbz : null, note: null};
@@ -292,6 +296,16 @@ export default {
 
 			return preparedFormData;
 		},
+		getDefaultStunden(projekttyp_kurzbz) {
+			let stunden = '0.0';
+			if (projekttyp_kurzbz == 'Bachelor') stunden = this.config.defaultProjektbetreuerStunden;
+			if (projekttyp_kurzbz == 'Diplom') stunden = this.config.defaultProjektbetreuerStundenDiplom;
+			return stunden;
+		},
+		setDefaultStunden(projekttyp_kurzbz) {
+			this.projekttyp_kurzbz = projekttyp_kurzbz;
+			if (!this.formDataModified()) this.formData.stunden = this.getDefaultStunden(projekttyp_kurzbz);
+		},
 		getNewBetreuerId() {
 			let max = 0;
 
@@ -333,7 +347,7 @@ export default {
 			>
 		</core-filter-cmpt>
 
-		<form-form ref="formProjektbetreuer" @submit.prevent>
+		<form-form ref="formProjektbetreuer" v-show="editMode" @submit.prevent>
 			<div class="row mb-3">
 				<form-input
 					container-class="stv-details-projektarbeit-betreuer"
@@ -409,7 +423,7 @@ export default {
 			</div>
 
 		</form-form>
-		<button class="btn btn-primary" @click="confirmProjektbetreuerAfterValidation">{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}</button>
+		<button class="btn btn-primary" v-show="editMode" @click="confirmProjektbetreuerAfterValidation">{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}</button>
 	</div>
 `
 }

From 7548d7b55fcaa70371a3e8b5c18764663d86f335 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sun, 18 May 2025 16:35:30 +0200
Subject: [PATCH 005/101] Projektbetreuer: new and edit mode

---
 .../api/frontend/v1/stv/Projektbetreuer.php      |  2 +-
 .../Details/Projektarbeit/Projektbetreuer.js     | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index 58b963ede..33e31c39a 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -171,7 +171,7 @@ class Projektbetreuer extends FHCAPI_Controller
 		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
 
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektbetreuer ID'], self::ERROR_TYPE_GENERAL));
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID'], self::ERROR_TYPE_GENERAL));
 
 		if (!isset($person_id) || !is_numeric($person_id))
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID'], self::ERROR_TYPE_GENERAL));
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index ea8dba94f..9ebe3de7e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -15,6 +15,9 @@ export default {
 	inject: {
 	},
 	computed: {
+		betreuerFormOpened() {
+			return this.newMode || this.editMode;
+		}
 	},
 	props: {
 		config: {
@@ -93,6 +96,7 @@ export default {
 				stunden: null,
 				stundensatz: null
 			},
+			newMode: false,
 			editMode: false,
 			initialFormData: null,
 			defaultFormDataValues: {stunden: null, stundensatz: null},
@@ -112,7 +116,8 @@ export default {
 		actionNewProjektbetreuer() {
 			this.resetForm();
 			this.statusNew = true;
-			this.editMode = !this.editMode;
+			this.newMode = !this.newMode;
+			this.editMode = false;
 			this.captureFormData();
 		},
 		actionEditProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
@@ -197,7 +202,7 @@ export default {
 			}
 		},
 		confirmProjektbetreuer() {
-			if (!this.editMode) return;
+			if (!this.betreuerFormOpened) return;
 
 			if (typeof this.formData.betreuer_id == 'undefined') {
 				this.formData.betreuer_id = this.getNewBetreuerId();
@@ -207,6 +212,7 @@ export default {
 				this.statusNew = true;
 			}
 
+			this.newMode = false;
 			this.editMode = false;
 		},
 		confirmProjektbetreuerAfterValidation() {
@@ -248,7 +254,7 @@ export default {
 		validateProjektbetreuer() {
 			let alleBetreuer = this.$refs.table.tabulator.getData();
 
-			if (this.editMode) {
+			if (this.betreuerFormOpened) {
 				alleBetreuer.push(this.addAutoCompleteBetreuerToFormData(this.formData));
 			}
 
@@ -347,7 +353,7 @@ export default {
 			>
 		</core-filter-cmpt>
 
-		<form-form ref="formProjektbetreuer" v-show="editMode" @submit.prevent>
+		<form-form ref="formProjektbetreuer" v-show="betreuerFormOpened" @submit.prevent>
 			<div class="row mb-3">
 				<form-input
 					container-class="stv-details-projektarbeit-betreuer"
@@ -423,7 +429,7 @@ export default {
 			</div>
 
 		</form-form>
-		<button class="btn btn-primary" v-show="editMode" @click="confirmProjektbetreuerAfterValidation">{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}</button>
+		<button class="btn btn-primary" v-show="betreuerFormOpened" @click="confirmProjektbetreuerAfterValidation">{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}</button>
 	</div>
 `
 }

From 1ca5bd5691e72f41e885ca667b69f706f2fd63cd Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 21 May 2025 22:00:04 +0200
Subject: [PATCH 006/101] Studierendenverwaltung Projektarbeit: added phrases,
 only necessary Projektarbeit properties are set when saving

---
 .../api/frontend/v1/stv/Config.php            |   3 +-
 .../api/frontend/v1/stv/Projektarbeit.php     |  36 +-
 .../api/frontend/v1/stv/Projektbetreuer.php   |  26 +-
 .../Details/Projektarbeit/Details.js          |  23 +-
 .../Details/Projektarbeit/Projektarbeit.js    |  66 ++-
 .../Details/Projektarbeit/Projektbetreuer.js  |  28 +-
 system/phrasesupdate.php                      | 504 +++++++++++++++++-
 7 files changed, 609 insertions(+), 77 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index afdf8efb8..98a06ffb5 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -45,7 +45,8 @@ class Config extends FHCAPI_Controller
 			'lehre',
 			'stv',
 			'konto',
-			'abschlusspruefung'
+			'abschlusspruefung',
+			'projektarbeit'
 		]);
 
 		// Load Config
diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index 70775fdbc..244dba412 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -112,15 +112,15 @@ class Projektarbeit extends FHCAPI_Controller
 
 		$formData = $this->input->post('formData');
 
-		$this->addMeta('form', $formData);
-
 		if ($this->_validate($formData) == false)
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
+		$projektarbeit = $this->_getProjektarbeitArr($formData);
+
 		$result = $this->ProjektarbeitModel->insert(
-			array_merge($formData, ['insertamum' => date('c'), 'insertvon' => getAuthUID(), 'student_uid' => $student_uid])
+			array_merge($projektarbeit, ['insertamum' => date('c'), 'insertvon' => getAuthUID(), 'student_uid' => $student_uid])
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
@@ -145,9 +145,11 @@ class Projektarbeit extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
+		$projektarbeit = $this->_getProjektarbeitArr($formData);
+
 		$result = $this->ProjektarbeitModel->update(
 			$projektarbeit_id,
-			array_merge($formData, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
+			array_merge($projektarbeit, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
@@ -196,7 +198,8 @@ class Projektarbeit extends FHCAPI_Controller
 	{
 		$searchString = $this->input->get('searchString');
 
-		if (!isset($searchString)) $this->terminateWithError($this->p->t('projektarbeit', 'error_searchStringMissing', self::ERROR_TYPE_GENERAL));
+		if (!isset($searchString))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Search term']), self::ERROR_TYPE_GENERAL);
 
 		$result = $this->FirmaModel->searchFirmen($searchString, $aktiv = true);
 
@@ -285,6 +288,29 @@ class Projektarbeit extends FHCAPI_Controller
 		return $this->form_validation->run();
 	}
 
+	/**
+	 * 
+	 * @param
+	 * @return object success or error
+	 */
+	private function _getProjektarbeitArr($formData)
+	{
+		return [
+			'titel' => $formData['titel'],
+			'titel_english' => $formData['titel_english'] ?? null,
+			'themenbereich' => $formData['themenbereich'] ?? null,
+			'projekttyp_kurzbz' => $formData['projekttyp_kurzbz'],
+			'firma_id' => $formData['firma_id'] ?? null,
+			'lehreinheit_id' => $formData['lehreinheit_id'],
+			'beginn' => $formData['beginn'] ?? null,
+			'note' => $formData['note'] ?? null,
+			'final' => $formData['final'] ?? null,
+			'freigegeben' => $formData['freigegeben'] ?? null,
+			'anmerkung' => $formData['anmerkung'] ?? null,
+			'gesperrtbis' => $formData['gesperrtbis'] ?? null
+		];
+	}
+
 	/**
 	 *
 	 * @param
diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index 33e31c39a..abdaa3c3d 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -45,7 +45,8 @@ class Projektbetreuer extends FHCAPI_Controller
 	{
 		$projektarbeit_id = $this->input->get('projektarbeit_id');
 
-		if (!isset($projektarbeit_id)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
+		if (!isset($projektarbeit_id))
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
 
 		$this->ProjektbetreuerModel->addSelect(
 			'projektarbeit_id, person_id, nachname, vorname, note, punkte, round(stunden, 1) AS stunden,
@@ -98,14 +99,8 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		$projektbetreuer = $this->input->post('projektbetreuerListe');
 
-		//$this->addMeta('form', $projektbetreuer);
-
 		if (!is_array($projektbetreuer))
-		{
-			return $this->terminateWithError(
-				$this->p->t('projektarbeit', 'error_invalidProjektbetreuer'), self::ERROR_TYPE_GENERAL
-			);
-		}
+			return $this->terminateWithError($this->p->t('projektarbeit', 'error_invalidProjektbetreuer'), self::ERROR_TYPE_GENERAL);
 
 		foreach ($projektbetreuer as $pb)
 		{
@@ -120,17 +115,6 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		foreach ($projektbetreuer as $pb)
 		{
-		//~ $this->addMeta('form', $pb);
-		//~ error_log(print_r($pb, true));
-		//die();
-
-			//~ $this->ProjektbetreuerModel->addSelect('1');
-			//~ $checkResult = $this->ProjektbetreuerModel->loadWhere(
-				//~ ['person_id' => $pb['person_id'], 'projektarbeit_id' => $projektarbeit_id, 'betreuerart_kurzbz' => $pb['betreuerart_kurzbz']]
-			//~ );
-
-			//~ if (isError($checkResult)) $this->terminateWithError(getError($checkResult), self::ERROR_TYPE_GENERAL);
-
 			$betreuer = [
 				'projektarbeit_id' => $projektarbeit_id,
 				'person_id' => $pb['person_id'],
@@ -236,7 +220,9 @@ class Projektbetreuer extends FHCAPI_Controller
 	{
 		$searchString = $this->input->get('searchString');
 
-		if (!isset($searchString)) $this->terminateWithError($this->p->t('projektarbeit', 'error_searchStringMissing', self::ERROR_TYPE_GENERAL));
+		if (!isset($searchString))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Search term']), self::ERROR_TYPE_GENERAL);
+
 
 		$result = $this->PersonModel->searchPerson($searchString);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index b384196d8..4f833621d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -217,23 +217,25 @@ export default {
 		getPreparedFormData() {
 			let preparedFormData = JSON.parse(JSON.stringify(this.formData)); // deep copy
 
+			// set firma Id
+			if (preparedFormData.firma)
+				preparedFormData.firma_id = preparedFormData.firma.firma_id;
+			else
+				preparedFormData.firma_id = null;
+
 			// delete "helper" fields
 			if (preparedFormData.projektarbeit_id == null) delete(preparedFormData.projektarbeit_id);
-			if (preparedFormData.firma) preparedFormData.firma_id = preparedFormData.firma.firma_id;
 			delete(preparedFormData.firma);
 			delete(preparedFormData.firma_name);
 			delete(preparedFormData.lehrveranstaltung_id);
 
 			return preparedFormData;
 		}
-		//~ setDefaultFormData() {
-			//~ this.resetForm();
-		//~ },
 	},
 	template: `
 			<form-form v-if="!this.student.length" ref="formDetails" @submit.prevent>
 
-				<legend>{{this.$p.t('global','details')}}</legend>
+				<legend>Details</legend>
 				<p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p>
 
 				<div class="row mb-3">
@@ -242,8 +244,7 @@ export default {
 						type="text"
 						name="titel"
 						:label="$p.t('projektarbeit', 'titel')"
-						v-model="formData.titel"
-						>
+						v-model="formData.titel">
 					</form-input>
 				</div>
 
@@ -272,7 +273,7 @@ export default {
 				<div class="row mb-3">
 					<form-input
 						container-class="stv-details-projektarbeit-typ"
-						:label="$p.t('global', 'typ')"
+						:label="$p.t('projektarbeit', 'typ')"
 						type="select"
 						v-model="formData.projekttyp_kurzbz"
 						name="projekttyp_kurzbz"
@@ -326,7 +327,7 @@ export default {
 				<div class="row mb-3">
 					<form-input
 						container-class="stv-details-projektarbeit-le"
-						:label="$p.t('global', 'lvTeil')"
+						:label="$p.t('projektarbeit', 'lvTeil')"
 						type="select"
 						v-model="formData.lehreinheit_id"
 						name="lehreinheit_id"
@@ -370,7 +371,7 @@ export default {
 				<div class="row mb-3 align-items-center">
 					<form-input
 						container-class="col-8 stv-details-projektarbeit-gesperrtbis"
-						:label="$p.t('projektarbeit', 'gesperrtbis')"
+						:label="$p.t('projektarbeit', 'gesperrtBis')"
 						type="DatePicker"
 						v-model="formData.gesperrtbis"
 						auto-apply
@@ -413,7 +414,7 @@ export default {
 							container-class="form-check stv-details-projektarbeit-final"
 							type="checkbox"
 							name="final"
-							:label="$p.t('projektarbeit','final')"
+							label="final"
 							v-model="formData.final"
 						>
 						</form-input>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 5124a2ef6..cff1d6fb3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -4,7 +4,6 @@ import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
-
 import ApiStvProjektarbeit from '../../../../../api/factory/stv/projektarbeit.js';
 import ProjektarbeitDetails from "./Details.js";
 import Projektbetreuer from "./Projektbetreuer.js";
@@ -30,11 +29,11 @@ export default {
 		$reloadList: {
 			from: '$reloadList',
 			required: true
-		},
-		isBerechtigtDocAndOdt: {
-			from: 'hasPermissionOutputformat',
-			default: false
 		}
+		//~ isBerechtigtDocAndOdt: {
+			//~ from: 'hasPermissionOutputformat',
+			//~ default: false
+		//~ }
 	},
 	computed: {
 		//~ studentUids() {
@@ -44,16 +43,16 @@ export default {
 			//~ }
 			//~ return this.student.map(e => e.uid);
 		//~ },
-		studentKzs(){
-			if (this.student.uid)
-			{
-				return [this.student.studiengang_kz];
-			}
-			return this.student.map(e => e.studiengang_kz);
-		},
-		stg_kz(){
-			return this.studentKzs.length > 0 ? this.studentKzs.length[0] : null;
-		}
+		//~ studentKzs(){
+			//~ if (this.student.uid)
+			//~ {
+				//~ return [this.student.studiengang_kz];
+			//~ }
+			//~ return this.student.map(e => e.studiengang_kz);
+		//~ },
+		//~ stg_kz(){
+			//~ return this.studentKzs.length > 0 ? this.studentKzs.length[0] : null;
+		//~ }
 	},
 	props: {
 		student: Object
@@ -220,19 +219,38 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
-						await this.$p.loadCategory(['global', 'person', 'stv', 'ui']);
+						await this.$p.loadCategory(['global', 'person', 'stv', 'ui', 'projektarbeit']);
 
 
 						let cm = this.$refs.table.tabulator.columnManager;
 
-						//~ cm.getColumnByField('vorsitz_nachname').component.updateDefinition({
-							//~ title: this.$p.t('abschlusspruefung', 'vorsitz_header')
-						//~ });
-						/*
-						cm.getColumnByField('actions').component.updateDefinition({
-						title: this.$p.t('global', 'aktionen')
-												});
-						*/
+						cm.getColumnByField('projekttyp_kurzbz').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'typ')
+						});
+						cm.getColumnByField('titel').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'titel')
+						});
+						cm.getColumnByField('beginn').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'beginn')
+						});
+						cm.getColumnByField('ende').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'ende')
+						});
+						cm.getColumnByField('freigegeben').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'freigegeben')
+						});
+						cm.getColumnByField('gesperrtbis').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'gesperrtBis')
+						});
+						cm.getColumnByField('themenbereich').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'themenbereich')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'anmerkung')
+						});
+						cm.getColumnByField('firma_id').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'firmaId')
+						});
 					}
 				},
 			],
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 9ebe3de7e..17f77558e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -128,7 +128,7 @@ export default {
 				.call(ApiStvProjektbetreuer.getDefaultStundensaetze(person_id, this.studiensemester_kurzbz))
 				.then(result => {
 					this.resetForm();
-					let projektbetreuerListe = this.$refs.table.tabulator.getData();
+					let projektbetreuerListe = this.$refs.projektbetreuerTable.tabulator.getData();
 					const idx = projektbetreuerListe.findIndex(
 							betr =>
 								betr.person_id === person_id &&
@@ -162,7 +162,7 @@ export default {
 					return this.deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz)
 				})
 				.then(result => {
-					this.$refs.table.tabulator.deleteRow(betreuer_id);
+					this.$refs.projektbetreuerTable.tabulator.deleteRow(betreuer_id);
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -192,12 +192,12 @@ export default {
 				this.$api
 					.call(ApiStvProjektbetreuer.getProjektbetreuer(projektarbeit_id))
 					.then(result => {
-						this.$refs.table.tabulator.setData(this.addIds(result.data));
+						this.$refs.projektbetreuerTable.tabulator.setData(this.addIds(result.data));
 						this.resetForm();
 					})
 					.catch(this.$fhcAlert.handleSystemError);
 			} else {
-				this.$refs.table.tabulator.setData([]);
+				this.$refs.projektbetreuerTable.tabulator.setData([]);
 				this.resetForm();
 			}
 		},
@@ -206,9 +206,9 @@ export default {
 
 			if (typeof this.formData.betreuer_id == 'undefined') {
 				this.formData.betreuer_id = this.getNewBetreuerId();
-				this.$refs.table.tabulator.addData(this.addAutoCompleteBetreuerToFormData(this.formData));
+				this.$refs.projektbetreuerTable.tabulator.addData(this.addAutoCompleteBetreuerToFormData(this.formData));
 			} else {
-				this.$refs.table.tabulator.updateData([this.formData]);
+				this.$refs.projektbetreuerTable.tabulator.updateData([this.formData]);
 				this.statusNew = true;
 			}
 
@@ -228,7 +228,7 @@ export default {
 		saveProjektbetreuer(projektarbeit_id) {
 			this.confirmProjektbetreuer();
 			return this.$refs.formProjektbetreuer.call(
-				ApiStvProjektbetreuer.saveProjektbetreuer(projektarbeit_id, this.$refs.table.tabulator.getData())
+				ApiStvProjektbetreuer.saveProjektbetreuer(projektarbeit_id, this.$refs.projektbetreuerTable.tabulator.getData())
 			);
 		},
 		deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
@@ -252,7 +252,7 @@ export default {
 				});
 		},
 		validateProjektbetreuer() {
-			let alleBetreuer = this.$refs.table.tabulator.getData();
+			let alleBetreuer = this.$refs.projektbetreuerTable.tabulator.getData();
 
 			if (this.betreuerFormOpened) {
 				alleBetreuer.push(this.addAutoCompleteBetreuerToFormData(this.formData));
@@ -315,7 +315,7 @@ export default {
 		getNewBetreuerId() {
 			let max = 0;
 
-			for (const betreuer of this.$refs.table.tabulator.getData()) {
+			for (const betreuer of this.$refs.projektbetreuerTable.tabulator.getData()) {
 				if (betreuer.betreuer_id > max) max = betreuer.betreuer_id;
 			}
 
@@ -332,23 +332,23 @@ export default {
 			return false;
 		},
 		reload() {
-			this.$refs.table.reloadTable();
+			this.$refs.projektbetreuerTable.reloadTable();
 		}
 	},
 	template: `
 	<div class="stv-details-projektbetreuer h-100 pb-3">
 
-		<legend>{{this.$p.t('stv','betreuer')}}</legend>
+		<legend>{{this.$p.t('projektarbeit','betreuer')}}</legend>
 		<!-- <p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p> -->
 
 		<core-filter-cmpt
-			ref="table"
+			ref="projektbetreuerTable"
 			:tabulator-options="tabulatorOptions"
 			:tabulator-events="tabulatorEvents"
 			table-only
 			:side-menu="false"
 			new-btn-show
-			:new-btn-label="this.$p.t('stv', 'betreuer')"
+			:new-btn-label="this.$p.t('projektarbeit', 'betreuer')"
 			@click:new="actionNewProjektbetreuer"
 			>
 		</core-filter-cmpt>
@@ -372,7 +372,7 @@ export default {
 			<div class="row mb-3">
 				<form-input
 					container-class="col-6 stv-details-projektbetreuer-betreuerart"
-					:label="$p.t('global', 'betreuer')"
+					:label="$p.t('projektarbeit', 'betreuer')"
 					type="select"
 					v-model="formData.betreuerart_kurzbz"
 					name="betreuerart_kurzbz"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 40711ee9b..a4381b00d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41708,13 +41708,513 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Text inut field for assessment',
+				'text' => 'Text input field for assessment',
 				'description' => '',
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_projektarbeit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Project work',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'projektarbeitAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create project work',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'projektarbeitBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit project work',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'titel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Titel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Title',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'titelEnglisch',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Titel Englisch',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Title English',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'themenbereich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Themenbereich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Topic area',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'typ',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Typ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'firma',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Firma',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Company',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'lehrveranstaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrveranstaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'lvTeil',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Teil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'betreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betreuer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Assessor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'note',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Note',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Grade',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'stunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Hours',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'stundensatz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stundensatz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Hourly rate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'betreuerBestaetigen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betreuer bestätigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Confirm assessor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'beginn',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Beginn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Start',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'ende',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ende',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'End',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'freigegeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'freigegeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'approved',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'gesperrtBis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesperrt bis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Locked until',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'anmerkung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmerkung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Annotation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'firmaId',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Firma ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Company Id',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'error_betreuerNichtGeloescht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen nicht möglich, dieser Projektarbeit sind bereits BetreuerInnen zugewiesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deleting not possible, assessors were already assigned to this projekt work',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'error_paabgabeNichtGeloescht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen nicht möglich, für diese Projektarbeit gibt es bereits Projektarbeitsabgaben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deleting not possible, there are projekt submissions for this project work',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'error_invalidProjektbetreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektbetreuer ungültig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invalid project assessors',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'error_betreuerHatVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen nicht möglich, Projektbetreuer hat bereits einen Vertrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deleting not possible, project assessor has a contract already',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 69e05ccb388c178044fb410dde69bb28ca3a9789 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sat, 24 May 2025 10:14:08 +0200
Subject: [PATCH 007/101] Studentenverwaltung archive: switched to new api
 factory

---
 .../api/frontend/v1/stv/Archiv.php            |   6 +-
 public/js/api/factory/stv/archiv.js           |  44 ++++
 .../Stv/Studentenverwaltung/Details/Archiv.js | 225 +++++++++---------
 .../Details/Archiv/Edit.js                    |  17 +-
 4 files changed, 165 insertions(+), 127 deletions(-)
 create mode 100644 public/js/api/factory/stv/archiv.js

diff --git a/application/controllers/api/frontend/v1/stv/Archiv.php b/application/controllers/api/frontend/v1/stv/Archiv.php
index 91fc9643d..cc636951d 100644
--- a/application/controllers/api/frontend/v1/stv/Archiv.php
+++ b/application/controllers/api/frontend/v1/stv/Archiv.php
@@ -34,7 +34,7 @@ class Archiv extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'get' => ['admin:r', 'assistenz:r'],
+			'getArchiv' => ['admin:r', 'assistenz:r'],
 			'getArchivVorlagen' => ['admin:r', 'assistenz:r'],
 			'archive' => ['admin:w', 'assistenz:w'],
 			'download' => ['admin:w', 'assistenz:w'],
@@ -60,9 +60,9 @@ class Archiv extends FHCAPI_Controller
 	 
 	 * @return void
 	 */
-	public function get()
+	public function getArchiv()
 	{
-		$person_id = $this->input->post('person_id');
+		$person_id = $this->input->get('person_id');
 
 		$this->load->library('form_validation');
 
diff --git a/public/js/api/factory/stv/archiv.js b/public/js/api/factory/stv/archiv.js
new file mode 100644
index 000000000..4205a5ecc
--- /dev/null
+++ b/public/js/api/factory/stv/archiv.js
@@ -0,0 +1,44 @@
+export default {
+	getArchiv(person_id) {
+		console.log(person_id);
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/archiv/getArchiv',
+			params: { person_id }
+		};
+	},
+	getArchivVorlagen() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/archiv/getArchivVorlagen'
+		};
+	},
+	archive(data) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/documents/archive',
+			params: data
+		};
+	},
+	archiveSigned(data) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/documents/archiveSigned',
+			params: data
+		};
+	},
+	update(data) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/archiv/update',
+			params: data
+		};
+	},
+	delete(akte_id, studiengang_kz) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/archiv/delete',
+			params: {akte_id, studiengang_kz}
+		};
+	}
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index fd174e16f..0efa9519c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../filter/Filter.js";
 import FormInput from "../../../Form/Input.js";
 import AkteEdit from "./Archiv/Edit.js";
 
+import ApiStvArchiv from '../../../../api/factory/stv/archiv.js';
+
 export default {
 	components: {
 		CoreFilterCmpt,
@@ -61,119 +63,108 @@ export default {
 				'abschlussdokument_lehrgaenge.xml.php': [
 						'AbschlussdokumentLehrgaenge'
 				]
-			}
-			//studiengang_kz: false
-		};
-	},
-	computed: {
-		//~ personIds() {
-			//~ if (this.modelValue.person_id)
-				//~ return [this.modelValue.person_id];
-			//~ return this.modelValue.map(e => e.person_id);
-		//~ },
-		tabulatorColumns() {
-			const columns = [
-				{title: "Akte Id", field: "akte_id", visible: false},
-				{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
-				{title: this.$p.t('stv', 'archiv_description'), field: "bezeichnung"},
-				{title: this.$p.t('stv', 'archiv_creation_date'), field: "erstelltam"},
-				{
-					title: this.$p.t('stv', 'archiv_signiert'),
-					field: "signiert",
-					formatter:"tickCross",
-					hozAlign:"center",
-					formatterParams: {
-						tickElement: '<i class="fa fa-check text-success"></i>',
-						crossElement: '<i class="fa fa-xmark text-danger"></i>'
-					}
-				},
-				{
-					title: "Selfservice",
-					field: "stud_selfservice",
-					formatter:"tickCross",
-					hozAlign:"center",
-					formatterParams: {
-						tickElement: '<i class="fa fa-check text-success"></i>',
-						crossElement: '<i class="fa fa-xmark text-danger"></i>'
-					},
-				},
-				{title: this.$p.t('stv', 'archiv_accepted_on_at'), field: "akzeptiertamum"},
-				{
-					title: this.$p.t('stv', 'archiv_gedruckt'),
-					field: "gedruckt",
-					visible: false,
-					formatter:"tickCross",
-					hozAlign:"center",
-					formatterParams: {
-						tickElement: '<i class="fa fa-check text-success"></i>',
-						crossElement: '<i class="fa fa-xmark text-danger"></i>'
-					}
-				},
-				{
-					title: 'Aktionen', field: 'actions',
-					formatter: (cell, formatterParams, onRendered) => {
-						let container = document.createElement('div');
-						container.className = "d-flex gap-2";
-
-						if (this.config.showEdit)
-						{
-							let editButton = document.createElement('button');
-							editButton.className = 'btn btn-outline-secondary';
-							editButton.innerHTML = '<i class="fa fa-edit"></i>';
-							editButton.addEventListener('click', () =>
-								this.$refs.edit.open(cell.getData())
-							);
-							container.append(editButton);
+			},
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(
+						ApiStvArchiv.getArchiv(
+							this.modelValue.person_id ? [this.modelValue.person_id] : null || this.modelValue.map(e => e.person_id)
+						)
+					),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Akte Id", field: "akte_id", visible: false},
+					{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
+					{title: this.$p.t('stv', 'archiv_description'), field: "bezeichnung"},
+					{title: this.$p.t('stv', 'archiv_creation_date'), field: "erstelltam"},
+					{
+						title: this.$p.t('stv', 'archiv_signiert'),
+						field: "signiert",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
 						}
-
-						let deleteButton = document.createElement('button');
-						deleteButton.className = 'btn btn-outline-secondary';
-						deleteButton.innerHTML = '<i class="fa fa-trash"></i>';
-						deleteButton.addEventListener('click', evt => {
-							evt.stopPropagation();
-							this.$fhcAlert
-								.confirmDelete()
-								.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz: this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
-								.then(this.$fhcApi.factory.stv.archiv.delete)
-								.then(() => {
-									//cell.getRow().delete();
-									this.reload();
-								})
-								.catch(this.$fhcAlert.handleSystemError);
-						});
-						container.append(deleteButton);
-
-						return container;
 					},
-					minWidth: 150, // Ensures Action-buttons will be always fully displayed
-					maxWidth: 150,
-					frozen: true
-				}
-			];
-			return Object.values(columns);
-		},
-		tabulatorOptions() {
-			return this.$fhcApi.factory.stv.archiv.tabulatorConfig({
+					{
+						title: "Selfservice",
+						field: "stud_selfservice",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						},
+					},
+					{title: this.$p.t('stv', 'archiv_accepted_on_at'), field: "akzeptiertamum"},
+					{
+						title: this.$p.t('stv', 'archiv_gedruckt'),
+						field: "gedruckt",
+						visible: false,
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{
+						title: 'Aktionen', field: 'actions',
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							if (this.config.showEdit)
+							{
+								let editButton = document.createElement('button');
+								editButton.className = 'btn btn-outline-secondary';
+								editButton.innerHTML = '<i class="fa fa-edit"></i>';
+								editButton.addEventListener('click', () =>
+									this.$refs.edit.open(cell.getData())
+								);
+								container.append(editButton);
+							}
+
+							let deleteButton = document.createElement('button');
+							deleteButton.className = 'btn btn-outline-secondary';
+							deleteButton.innerHTML = '<i class="fa fa-trash"></i>';
+							deleteButton.addEventListener('click', evt => {
+								evt.stopPropagation();
+								this.$fhcAlert
+									.confirmDelete()
+									.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz : this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
+									.then(params => this.$api.call(ApiStvArchiv.delete(params.akte_id, params.studiengang_kz)))
+									.then(() => {
+										//cell.getRow().delete();
+										this.reload();
+									})
+									.catch(this.$fhcAlert.handleSystemError);
+							});
+							container.append(deleteButton);
+
+							return container;
+						},
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						maxWidth: 150,
+						frozen: true
+					}
+				],
 				layout:"fitDataTable",
-				columns: this.tabulatorColumns,
-				//selectable: true,
-				//selectableRangeMode: 'click',
 				index: 'akte_id',
 				persistenceID: 'stv-details-archiv'
-			}, this);
-		},
-		tabulatorEvents() {
-			const events = [
+			},
+			tabulatorEvents: [
 				{
 					event: "rowDblClick",
 					handler: (e, row) => {
 						this.actionDownload(row.getData().akte_id);
 					}
 				}
-			];
-
-			return events;
-		}
+			]
+		};
+	},
+	computed: {
 	},
 	watch: {
 		modelValue() {
@@ -195,18 +186,22 @@ export default {
 			for (let archiveData of archiveDataArr)
 			{
 				this.loading = true;
+
+				// sign document depending on signierbar property
 				let archiveFunction =
 					this.selectedVorlage.signierbar
-					? this.$fhcApi.factory.stv.archiv.archiveSigned
-					: this.$fhcApi.factory.stv.archiv.archive;
+					? ApiStvArchiv.archiveSigned
+					: ApiStvArchiv.archive;
 
-				archiveFunction({
-					xml: this.getXmlByXsl(this.selectedVorlage.vorlage_kurzbz),
-					xsl: this.selectedVorlage.vorlage_kurzbz,
-					ss: this.defaultSemester,
-					uid: archiveData.uid,
-					prestudent_id: archiveData.prestudent_id
-				})
+				this.$api.call(
+					archiveFunction({
+						xml: this.getXmlByXsl(this.selectedVorlage.vorlage_kurzbz),
+						xsl: this.selectedVorlage.vorlage_kurzbz,
+						ss: this.defaultSemester,
+						uid: archiveData.uid,
+						prestudent_id: archiveData.prestudent_id
+					})
+				)
 				.then(result => result.data)
 				.then(() => {
 					this.reload();
@@ -237,10 +232,10 @@ export default {
 		}
 	},
 	created() {
-		this.$fhcApi
-			.factory.stv.archiv.getArchivVorlagen()
-			.then(result => {this.vorlagenArchiv = result.data; this.selectedVorlage = result.data.filter(o => o.vorlage_kurzbz == 'Zeugnis')[0];})
-			.catch(this.$fhcAlert.handleSystemError);
+			this.$api
+				.call(ApiStvArchiv.getArchivVorlagen())
+				.then(result => {this.vorlagenArchiv = result.data; this.selectedVorlage = result.data.filter(o => o.vorlage_kurzbz == 'Zeugnis')[0];})
+				.catch(this.$fhcAlert.handleSystemError);
 
 	},
 	template: `
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
index e819eb252..c280a50f4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
@@ -93,15 +93,14 @@ export default {
 						v-model="data.signiert"
 					>
 					</form-input>
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="stud_selfservice"
-							:label="'Selfservice'"
-							v-model="data.stud_selfservice"
-					>
+					<form-input
+						container-class="form-check"
+						type="checkbox"
+						name="stud_selfservice"
+						:label="'Selfservice'"
+						v-model="data.stud_selfservice">
+					</form-input>
 				</div>
-				</form-input>
 			</fieldset>
 
 			<template #title>
@@ -115,4 +114,4 @@ export default {
 			</template>
 		</bs-modal>
 	</core-form>`
-};
\ No newline at end of file
+};

From 9a7cba0717034b7add6e6d983a5fab8125aad79e Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 30 May 2025 17:54:51 +0200
Subject: [PATCH 008/101] Studentenverwaltung Projektarbeit: added possibility
 to create persons, added phrases

---
 .../api/frontend/v1/stv/Archiv.php            |  15 -
 .../api/frontend/v1/stv/Projektbetreuer.php   |  30 +-
 .../api/frontend/v1/stv/Student.php           | 181 ++++----
 public/js/api/factory/stv/projektbetreuer.js  |   7 +
 public/js/api/factory/stv/students.js         |   9 +-
 .../Details/Projektarbeit/Projektarbeit.js    |   1 -
 .../Details/Projektarbeit/Projektbetreuer.js  |  65 ++-
 .../Stv/Studentenverwaltung/List/New.js       | 353 ++++++++--------
 system/phrasesupdate.php                      | 390 +++++++++++++++++-
 9 files changed, 749 insertions(+), 302 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Archiv.php b/application/controllers/api/frontend/v1/stv/Archiv.php
index cc636951d..55f4270d6 100644
--- a/application/controllers/api/frontend/v1/stv/Archiv.php
+++ b/application/controllers/api/frontend/v1/stv/Archiv.php
@@ -107,13 +107,9 @@ class Archiv extends FHCAPI_Controller
 
 		$result = $this->AkteModel->load($akte_id);
 
-
 		if (!hasData($result)) $this->terminateWithError('Akte not found');
 
-		$data = $this->getDataOrTerminateWithError($result);
-
 		$data = getData($result)[0];
-		//$this->addMeta("daa", $data->inhalt);
 
 		$fileObj = new stdClass();
 		if (isset($data->inhalt) && $data->inhalt != '')
@@ -133,12 +129,7 @@ class Archiv extends FHCAPI_Controller
 			//header("Content-type: $data->mimetype");
 			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
 			readfile($filename);
-			//echo base64_decode($data->inhalt);
 			die();
-			//~ $fileObj->file = $data->inhalt;
-			//~ $fileObj->name = $data->titel;
-			//~ $fileObj->mimetype = $data->mimetype;
-			//~ $fileObj->disposition = 'attachment';
 		}
 		else
 		{
@@ -146,12 +137,6 @@ class Archiv extends FHCAPI_Controller
 
 			$result = $this->aktelib->get($akte_id);
 		}
-
-	/*	$fileObj->filename
-	 * 	$fileObj->file
-	 * 	$fileObj->name
-	 * 	$fileObj->mimetype
-	 * 	$fileObj->disposition*/
 	}
 
 	/**
diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index abdaa3c3d..34f626eca 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -16,6 +16,7 @@ class Projektbetreuer extends FHCAPI_Controller
 			'getNoten' => ['admin:r', 'assistenz:r'],
 			'getDefaultStundensaetze' => ['admin:r', 'assistenz:r'],
 			'getProjektbetreuerBySearchQuery' => ['admin:r', 'assistenz:r'],
+			'getPerson' => ['admin:r', 'assistenz:r'],
 			'validateProjektbetreuer' => ['admin:r', 'assistenz:r']
 		]);
 
@@ -52,7 +53,7 @@ class Projektbetreuer extends FHCAPI_Controller
 			'projektarbeit_id, person_id, nachname, vorname, note, punkte, round(stunden, 1) AS stunden,
 			stundensatz, betreuerart_kurzbz, vertrag_id, titelpre, titelpost'
 		);
-		$this->ProjektbetreuerModel-> addSelect("CASE
+		$this->ProjektbetreuerModel->addSelect("CASE
 				WHEN EXISTS
 					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=pers.person_id)
 				THEN 'Mitarbeiter'
@@ -223,16 +224,37 @@ class Projektbetreuer extends FHCAPI_Controller
 		if (!isset($searchString))
 			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Search term']), self::ERROR_TYPE_GENERAL);
 
-
 		$result = $this->PersonModel->searchPerson($searchString);
 
-		$this->addMeta('met', $result);
-
 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
 		return $this->terminateWithSuccess(hasData($result) ? $this->_addFullNameToBetreuer(getData($result)) : []);
 	}
 
+	public function getPerson()
+	{
+		$person_id = $this->input->get('person_id');
+
+		if (!isset($person_id))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Person']), self::ERROR_TYPE_GENERAL);
+
+		$this->PersonModel->addSelect("CASE
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=tbl_person.person_id)
+				THEN 'Mitarbeiter'
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=tbl_person.person_id)
+				THEN 'Student'
+				ELSE 'Person'
+			END AS status");
+		$result = $this->PersonModel->addSelect('titelpre, titelpost, vorname, nachname, person_id');
+		$result = $this->PersonModel->load($person_id);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? $this->_addFullNameToBetreuer(getData($result))[0] : []);
+	}
+
 	/**
 	 *
 	 * @param
diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index f24ef62bb..58dabc2f5 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -55,7 +55,7 @@ class Student extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'lehre'
+			'ui', 'lehre', 'person'
 		]);
 	}
 
@@ -322,40 +322,47 @@ class Student extends FHCAPI_Controller
 		if (!$this->input->post('person_id')) {
 			if (!isset($_POST['address']) || !is_array($_POST['address']))
 				$_POST['address'] = [];
-			$_POST['address']['func'] = 1;
 		}
 		if ($this->input->post('incoming')) {
 			$_POST['ausbildungssemester'] = 0;
 		}
 
+		$this->addMeta('test', $_POST['personOnly']);
+
 		$this->load->library('form_validation');
 
 		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
-			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'nachname')])
 		]);
 		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
-			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'geschlecht')])
 		]);
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', ['isValidDate', function($value) { return isValidDate($value); }], [
 			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
 		]);
 		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
 		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'plz')])
 		]);
 		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'gemeinde')])
 		]);
 		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'ort')])
 		]);
 		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'adresse')])
 		]);
 		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
-		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
-		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
-		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'callback_requiredIfStudentFunc', [
+			'requiredIfStudentFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'studiengang')])
+		]);
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'callback_requiredIfStudentFunc', [
+			'requiredIfStudentFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'studiensemester')])
+		]);
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'callback_requiredIfStudentFunc|integer|less_than[9]|greater_than[-1]', [
+			'requiredIfStudentFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'ausbildungssemester')])
+		]);
 		// TODO(chris): validate studienplan with studiengang, semester and orgform?
 		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
 
@@ -432,6 +439,8 @@ class Student extends FHCAPI_Controller
 				'zustelladresse' => true,
 			];
 			if ($anlegen < 0) { // Überschreiben
+				$this->AdresseModel->addSelect('adresse_id');
+				$this->AdresseModel->addJoin('public.tbl_adressentyp', 'typ = adressentyp_kurzbz');
 				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
 				$this->AdresseModel->addOrder('sort');
 				$result = $this->AdresseModel->loadWhere([
@@ -488,79 +497,84 @@ class Student extends FHCAPI_Controller
 			}
 		}
 
-		// Prestudent anlegen
-		$data = [
-			'aufmerksamdurch_kurzbz' => 'k.A.',
-			'person_id' => $person_id,
-			'studiengang_kz' => $this->input->post('studiengang_kz'),
-			'ausbildungcode' => $this->input->post('letzteausbildung'),
-			'anmerkung' => $this->input->post('anmerkungen'),
-			'reihungstestangetreten' => false,
-			'bismelden' => true
-		];
-		$ausbildungsart = $this->input->post('ausbildungsart');
-		if ($ausbildungsart)
-			$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
-		// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
-		$incoming = $this->input->post('incoming');
-		if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
-			$data['foerderrelevant'] = false;
-		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
-		$this->PrestudentModel->addOrder('zgvmas_code');
-		$this->PrestudentModel->addOrder('zgv_code', 'DESC');
-		$this->PrestudentModel->addLimit(1);
-		$result = $this->PrestudentModel->loadWhere([
-			'person_id' => $person_id
-		]);
-		$prestudent = $this->getDataOrTerminateWithError($result);
-		if ($prestudent) {
-			$prestudent = current($prestudent);
-			if ($prestudent->zgv_code) {
-				$data['zgv_code'] = $prestudent->zgv_code;
-				$data['zgvort'] = $prestudent->zgvort;
-				$data['zgvdatum'] = $prestudent->zgvdatum;
+		$personOnly = $anlegen = $this->input->post('personOnly');
 
-				$data['zgvmas_code'] = $prestudent->zgvmas_code;
-				$data['zgvmaort'] = $prestudent->zgvmaort;
-				$data['zgvmadatum'] = $prestudent->zgvmadatum;
+		if (!$personOnly)
+		{
+			// Prestudent anlegen
+			$data = [
+				'aufmerksamdurch_kurzbz' => 'k.A.',
+				'person_id' => $person_id,
+				'studiengang_kz' => $this->input->post('studiengang_kz'),
+				'ausbildungcode' => $this->input->post('letzteausbildung'),
+				'anmerkung' => $this->input->post('anmerkungen'),
+				'reihungstestangetreten' => false,
+				'bismelden' => true
+			];
+			$ausbildungsart = $this->input->post('ausbildungsart');
+			if ($ausbildungsart)
+				$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
+			// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
+			$incoming = $this->input->post('incoming');
+			if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
+				$data['foerderrelevant'] = false;
+			// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
+			$this->PrestudentModel->addOrder('zgvmas_code');
+			$this->PrestudentModel->addOrder('zgv_code', 'DESC');
+			$this->PrestudentModel->addLimit(1);
+			$result = $this->PrestudentModel->loadWhere([
+				'person_id' => $person_id
+			]);
+			$prestudent = $this->getDataOrTerminateWithError($result);
+			if ($prestudent) {
+				$prestudent = current($prestudent);
+				if ($prestudent->zgv_code) {
+					$data['zgv_code'] = $prestudent->zgv_code;
+					$data['zgvort'] = $prestudent->zgvort;
+					$data['zgvdatum'] = $prestudent->zgvdatum;
+
+					$data['zgvmas_code'] = $prestudent->zgvmas_code;
+					$data['zgvmaort'] = $prestudent->zgvmaort;
+					$data['zgvmadatum'] = $prestudent->zgvmadatum;
+				}
 			}
-		}
-		// Prestudent speichern
-		$result = $this->PrestudentModel->insert($data);
-		$prestudent_id = $this->getDataOrTerminateWithError($result);
+			// Prestudent speichern
+			$result = $this->PrestudentModel->insert($data);
+			$prestudent_id = $this->getDataOrTerminateWithError($result);
 
-		// Prestudent Rolle Anlegen
-		$data = [
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent',
-			'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'),
-			'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0,
-			'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null,
-			'studienplan_id' => $this->input->post('studienplan_id') ?: null,
-			'datum' => date('Y-m-d'),
-			'insertamum' => date('c'),
-			'insertvon' => getAuthUID()
-		];
-		$result = $this->PrestudentstatusModel->insert($data);
-		$this->getDataOrTerminateWithError($result);
+			// Prestudent Rolle Anlegen
+			$data = [
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent',
+				'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'),
+				'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0,
+				'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null,
+				'studienplan_id' => $this->input->post('studienplan_id') ?: null,
+				'datum' => date('Y-m-d'),
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID()
+			];
+			$result = $this->PrestudentstatusModel->insert($data);
+			$this->getDataOrTerminateWithError($result);
 
-		if ($incoming) {
-			// TODO(chris): IMPLEMENT!
-			//Matrikelnummer und UID generieren
-			//Benutzerdatensatz anlegen
-			//Studentendatensatz anlegen
-			//StudentLehrverband anlegen
+			if ($incoming) {
+				// TODO(chris): IMPLEMENT!
+				//Matrikelnummer und UID generieren
+				//Benutzerdatensatz anlegen
+				//Studentendatensatz anlegen
+				//StudentLehrverband anlegen
+			}
+
+			// TODO(chris): DEBUG
+			/*$result = $this->PrestudentModel->loadWhere([
+				'pestudent_id' => 1
+			]);
+			if (isError($result)) {
+				return $result;
+			}*/
 		}
 
-		// TODO(chris): DEBUG
-		/*$result = $this->PrestudentModel->loadWhere([
-			'pestudent_id' => 1
-		]);
-		if (isError($result)) {
-			return $result;
-		}*/
-
-		$this->terminateWithSuccess(true);
+		return ['person_id' => $person_id ?? null, 'prestudent_id' => $prestudent_id ?? null];
 	}
 
 	public function requiredIfNotPersonId($value)
@@ -572,7 +586,14 @@ class Student extends FHCAPI_Controller
 	
 	public function requiredIfAddressFunc($value)
 	{
-		if (!$_POST['address']['func'])
+		if (!$_POST['address']['func'] || $_POST['address']['func'] == 0)
+			return true;
+		return !!$value;
+	}
+
+	public function requiredIfStudentFunc($value)
+	{
+		if ($_POST['personOnly'])
 			return true;
 		return !!$value;
 	}
diff --git a/public/js/api/factory/stv/projektbetreuer.js b/public/js/api/factory/stv/projektbetreuer.js
index fc710fe81..211eaaca8 100644
--- a/public/js/api/factory/stv/projektbetreuer.js
+++ b/public/js/api/factory/stv/projektbetreuer.js
@@ -63,6 +63,13 @@ export default {
 			params: { searchString }
 		};
 	},
+	getPerson(person_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektbetreuer/getPerson',
+			params: { person_id }
+		};
+	},
 	validateProjektbetreuer(projektbetreuer) {
 		return {
 			method: 'post',
diff --git a/public/js/api/factory/stv/students.js b/public/js/api/factory/stv/students.js
index 582ba04e8..6edd5de4f 100644
--- a/public/js/api/factory/stv/students.js
+++ b/public/js/api/factory/stv/students.js
@@ -46,5 +46,12 @@ export default {
 			url: 'api/frontend/v1/stv/student/check',
 			params
 		};
+	},
+	add(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/student/add',
+			params
+		};
 	}
-};
\ No newline at end of file
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index cff1d6fb3..8314db8b3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -221,7 +221,6 @@ export default {
 					handler: async() => {
 						await this.$p.loadCategory(['global', 'person', 'stv', 'ui', 'projektarbeit']);
 
-
 						let cm = this.$refs.table.tabulator.columnManager;
 
 						cm.getColumnByField('projekttyp_kurzbz').component.updateDefinition({
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 17f77558e..079b8b796 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -2,6 +2,7 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+import NewPerson from "../../List/New.js";
 
 import ApiStvProjektbetreuer from '../../../../../api/factory/stv/projektbetreuer.js';
 
@@ -10,7 +11,8 @@ export default {
 		CoreFilterCmpt,
 		FormForm,
 		FormInput,
-		PvAutoComplete
+		PvAutoComplete,
+		NewPerson
 	},
 	inject: {
 	},
@@ -333,12 +335,24 @@ export default {
 		},
 		reload() {
 			this.$refs.projektbetreuerTable.reloadTable();
+		},
+		actionNewPerson() {
+			this.$refs.newPersonModal.reset();
+			this.$refs.newPersonModal.open();
+		},
+		personSaved(result) {
+			this.$api
+				.call(ApiStvProjektbetreuer.getPerson(result.person_id))
+				.then(response => {
+					this.autocompleteSelectedBetreuer = response.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError)
 		}
 	},
 	template: `
 	<div class="stv-details-projektbetreuer h-100 pb-3">
 
-		<legend>{{this.$p.t('projektarbeit','betreuer')}}</legend>
+		<legend>{{this.$p.t('projektarbeit','betreuerGross')}}</legend>
 		<!-- <p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p> -->
 
 		<core-filter-cmpt
@@ -348,7 +362,7 @@ export default {
 			table-only
 			:side-menu="false"
 			new-btn-show
-			:new-btn-label="this.$p.t('projektarbeit', 'betreuer')"
+			:new-btn-label="this.$p.t('projektarbeit', 'betreuerGross')"
 			@click:new="actionNewProjektbetreuer"
 			>
 		</core-filter-cmpt>
@@ -369,10 +383,16 @@ export default {
 				</form-input>
 			</div>
 
+			<div class="row mb-3">
+				<div class="col-12">
+					<button class="btn btn-primary" @click="actionNewPerson">{{ $p.t('projektarbeit', 'neuePersonAnlegen') }}</button>
+				</div>
+			</div>
+
 			<div class="row mb-3">
 				<form-input
 					container-class="col-6 stv-details-projektbetreuer-betreuerart"
-					:label="$p.t('projektarbeit', 'betreuer')"
+					:label="$p.t('projektarbeit', 'betreuerart')"
 					type="select"
 					v-model="formData.betreuerart_kurzbz"
 					name="betreuerart_kurzbz"
@@ -388,22 +408,22 @@ export default {
 			</div>
 
 			<div class="row mb-3">
-					<form-input
-						container-class="col-8 stv-details-projektbetreuer-note"
-						:label="$p.t('projektarbeit', 'note')"
-						type="select"
-						v-model="formData.note"
-						name="note"
+				<form-input
+					container-class="col-8 stv-details-projektbetreuer-note"
+					:label="$p.t('projektarbeit', 'note')"
+					type="select"
+					v-model="formData.note"
+					name="note"
+					>
+					<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+					<option
+						v-for="note in arrNoten"
+						:key="note.note"
+						:value="note.note"
 						>
-						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
-						<option
-							v-for="note in arrNoten"
-							:key="note.note"
-							:value="note.note"
-							>
-							{{note.bezeichnung}}
-						</option>
-					</form-input>
+						{{note.bezeichnung}}
+					</option>
+				</form-input>
 			</div>
 
 			<div class="row mb-3">
@@ -429,7 +449,12 @@ export default {
 			</div>
 
 		</form-form>
-		<button class="btn btn-primary" v-show="betreuerFormOpened" @click="confirmProjektbetreuerAfterValidation">{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}</button>
+
+		<button class="btn btn-primary" v-show="betreuerFormOpened" @click="confirmProjektbetreuerAfterValidation">
+			{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}
+		</button>
+
+		<new-person ref="newPersonModal" :personOnly="true" @saved="personSaved"></new-person>
 	</div>
 `
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index dc78aedb6..88de0bc2f 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -10,7 +10,7 @@ import ApiStvStudents from '../../../../api/factory/stv/students.js';
 var _uuid = 0;
 const FORMDATA_DEFAULT = {
 	address: {
-		func: 0,
+		func: 1,
 		nation: 'A'
 	},
 	geburtsnation: 'A',
@@ -33,7 +33,9 @@ export default {
 	inject: [
 		'lists'
 	],
+	emits: ['saved'],
 	props: {
+		personOnly: Boolean, 
 		studiengangKz: Number,
 		studiensemesterKurzbz: String
 	},
@@ -108,7 +110,7 @@ export default {
 				return;
 
 			this.abortController.suggestions = new AbortController();
-			
+
 			this.$api
 				.call(ApiStvStudents.check({
 					vorname: this.formData.vorname,
@@ -119,6 +121,11 @@ export default {
 				})
 				.then(result => this.suggestions = result.data)
 				.catch(error => {
+
+					if (error.code == 'ERR_BAD_REQUEST') {
+						return this.suggestions = [];
+					}
+
 					// NOTE(chris): repeat request
 					if (error.code != "ERR_CANCELED")
 						window.setTimeout(this.loadSuggestions, 100);
@@ -191,14 +198,22 @@ export default {
 			if (data.studiensemester_kurzbz === undefined)
 				data.studiensemester_kurzbz = this.studiensemesterKurzbz;
 
-			// TODO(chris): move to fhcapi.factory
-			this.$refs.form
-				.send('api/frontend/v1/stv/student/add', data)
-				.then(result => {
-					this.$fhcAlert.alertSuccess('Gespeichert');
-					this.$refs.modal.hide();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+			data.personOnly = this.personOnly;
+
+			this.$api.call(
+				ApiStvStudents.add(data)
+			)
+			.then(result => {
+				this.$emit('saved', result.data);
+				this.$fhcAlert.alertSuccess('Gespeichert');
+				this.$refs.modal.hide();
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		},
+		setPerson(suggestion)
+		{
+			this.person = suggestion;
+			this.formData.address.func = -1;
 		}
 	},
 	created() {
@@ -215,7 +230,7 @@ export default {
 	<fhc-form ref="form" class="stv-list-new" @submit.prevent="send">
 		<bs-modal ref="modal" dialog-class="modal-lg modal-scrollable" @hidden-bs-modal="reset">
 			<template #title>
-				InteressentIn anlegen
+				{{ personOnly ? $p.t('person', 'personAnlegen') : $p.t('lehre', 'interessentAnlegen') }}
 			</template>
 			<template #default>
 
@@ -225,36 +240,38 @@ export default {
 					<div class="row">
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Nachname*"
+								:label="$p.t('person', 'nachname')+'*'"
 								type="text"
 								id="stv-list-new-nachname"
 								name="nachname"
 								v-model="formDataPerson['nachname']"
-								:disabled="person"
+								:disabled="!!person"
 								@input="loadSuggestions"
+								:min-length="3"
 								>
 							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Vorname"
+								:label="$p.t('person', 'vorname')"
 								type="text"
 								:id="'stv-list-new-vorname-' + uuid"
 								name="vorname"
 								v-model="formDataPerson['vorname']"
-								:disabled="person"
+								:disabled="!!person"
 								@input="loadSuggestions"
+								:min-length="3"
 								>
 							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Geburtsdatum"
+								:label="$p.t('person', 'geburtsdatum')"
 								type="datepicker"
 								uid="stv-list-new-gebdatum"
 								name="gebdatum"
 								v-model="formDataPerson['gebdatum']"
-								:disabled="person"
+								:disabled="!!person"
 								@update:model-value="loadSuggestions"
 								text-input
 								auto-apply
@@ -267,13 +284,13 @@ export default {
 					</div>
 					<!-- TODO(chris): more details -->
 					<table class="table caption-top table-striped table-hover">
-						<caption>Prüfung ob Person bereits existiert</caption>
+						<caption>{{ $p.t('person', 'personExistiertPruefung') }}</caption>
 						<tbody>
 							<tr
 								v-for="(suggestion, index) in suggestions"
 								:key="suggestion.person_id"
 								:class="{'active': index == 2}"
-								@click="(index == 2) ? suggestions.shift() : person=suggestion"
+								@click="(index == 2) ? suggestions.shift() : setPerson(suggestion)"
 								v-accessibility:tab.vertical
 								>
 								<td>{{suggestion.vorname + ' ' + suggestion.nachname}}</td>
@@ -286,34 +303,34 @@ export default {
 					<div class="row">
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Anrede"
+								:label="$p.t('person', 'anrede')"
 								type="text"
 								id="stv-list-new-anrede"
 								name="anrede"
 								v-model="formDataPerson['anrede']"
-								:disabled="person"
+								:disabled="!!person"
 								>
 							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Titel (Pre)"
+								:label="$p.t('person', 'titelPre')"
 								type="text"
 								id="stv-list-new-titelpre"
 								name="titelpre"
 								v-model="formDataPerson['titelpre']"
-								:disabled="person"
+								:disabled="!!person"
 								>
 							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Titel (Post)"
+								:label="$p.t('person', 'titelPost')"
 								type="text"
 								id="stv-list-new-titelpost"
 								name="titelpost"
 								v-model="formDataPerson['titelpost']"
-								:disabled="person"
+								:disabled="!!person"
 								>
 							</form-input>
 						</div>
@@ -321,36 +338,38 @@ export default {
 					<div class="row">
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Nachname*"
+								:label="$p.t('person', 'nachname')+'*'"
 								type="text"
 								id="stv-list-new-nachname"
 								name="nachname"
 								v-model="formDataPerson['nachname']"
-								:disabled="person"
+								:disabled="!!person"
 								@input="loadSuggestions"
+								:min-length="3"
 								>
 							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Vorname"
+								:label="$p.t('person', 'vorname')"
 								type="text"
 								id="stv-list-new-vorname"
 								name="vorname"
 								v-model="formDataPerson['vorname']"
-								:disabled="person"
+								:disabled="!!person"
 								@input="loadSuggestions"
+								:min-length="3"
 								>
 							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Weitere Vornamen"
+								:label="$p.t('person', 'weitereVornamen')"
 								type="text"
 								id="stv-list-new-vornamen"
 								name="vornamen"
 								v-model="formDataPerson['vornamen']"
-								:disabled="person"
+								:disabled="!!person"
 								>
 							</form-input>
 						</div>
@@ -358,12 +377,12 @@ export default {
 					<div class="row">
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Wahlname"
+								:label="$p.t('person', 'wahlname')"
 								type="text"
 								id="stv-list-new-wahlname"
 								name="wahlname"
 								v-model="formDataPerson['wahlname']"
-								:disabled="person"
+								:disabled="!!person"
 								>
 							</form-input>
 						</div>
@@ -371,24 +390,24 @@ export default {
 					<div class="row">
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Geschlecht*"
+								:label="$p.t('person', 'geschlecht')+'*'"
 								type="select"
 								id="stv-list-new-geschlecht"
 								name="geschlecht"
 								v-model="formDataPerson['geschlecht']"
-								:disabled="person"
+								:disabled="!!person"
 								>
 								<option v-for="geschlecht in lists.geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
 							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Geburtsdatum"
+								:label="$p.t('person', 'geburtsdatum')"
 								type="datepicker"
 								uid="stv-list-new-gebdatum"
 								name="gebdatum"
 								v-model="formDataPerson['gebdatum']"
-								:disabled="person"
+								:disabled="!!person"
 								@update:model-value="loadSuggestions"
 								text-input
 								auto-apply
@@ -400,7 +419,7 @@ export default {
 						</div>
 					</div>
 					
-					<div v-if="person" class="row">
+					<div class="row">
 						<div class="col-sm-6 mb-3">
 							<form-input
 								type="select"
@@ -408,19 +427,19 @@ export default {
 								name="address[func]"
 								v-model="formData['address']['func']"
 								>
-								<option value="-1">Bestehende Adresse überschreiben</option>
-								<option value="1">Adresse hinzufügen</option>
-								<option value="0">Adresse nicht anlegen</option>
+								<option value="-1" v-if="person">{{ $p.t('person', 'bestehendeAdresseUeberschreiben') }}</option>
+								<option value="1">{{ $p.t('person', 'adresseHinzufuegen') }}</option>
+								<option value="0">{{ $p.t('person', 'adresseNichtAnlegen') }}</option>
 							</form-input>
 						</div>
 					</div>
 					
-					<fieldset v-if="!person || formData['address']['func']">
+					<fieldset v-if="formData['address']['func'] != 0">
 						<legend>Adresse</legend>
 						<div class="row">
 							<div class="col-sm-4 mb-3">
 								<form-input
-									label="Land"
+									:label="$p.t('person', 'land')"
 									type="select"
 									id="stv-list-new-address-nation"
 									name="address[nation]"
@@ -434,7 +453,7 @@ export default {
 						<div class="row">
 							<div class="col-sm-4 mb-3">
 								<form-input
-									label="PLZ"
+									:label="$p.t('person', 'plz')"
 									type="text"
 									id="stv-list-new-address-plz"
 									name="address[plz]"
@@ -445,18 +464,18 @@ export default {
 							</div>
 							<div class="col-sm-4 mb-3">
 								<form-input
-									label="Gemeinde"
+									:label="$p.t('person', 'gemeinde')"
 									type="select"
 									v-if="formData['address']['nation'] == 'A'"
 									id="stv-list-new-address-gemeinde"
 									name="address[gemeinde]"
 									v-model="formData['address']['gemeinde']"
 									>
-									<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+									<option v-if="!gemeinden.length" disabled>$p.t('ui', 'bittePlzWaehlen')</option>
 									<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
 								</form-input>
 								<form-input
-									label="Gemeinde"
+									:label="$p.t('person', 'gemeinde')"
 									type="text"
 									v-else
 									id="stv-list-new-address-gemeinde"
@@ -467,7 +486,7 @@ export default {
 							</div>
 							<div class="col-sm-4 mb-3">
 								<form-input
-									label="Ort"
+									:label="$p.t('person', 'ort')"
 									type="select"
 									v-if="formData['address']['nation'] == 'A'"
 									id="stv-list-new-address-ort"
@@ -478,7 +497,7 @@ export default {
 									<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
 								</form-input>
 								<form-input
-									label="Ort"
+									:label="$p.t('person', 'ort')"
 									type="text"
 									v-else
 									id="stv-list-new-address-ort"
@@ -491,7 +510,7 @@ export default {
 						<div class="row">
 							<div class="col-12 mb-3">
 								<form-input
-									label="Adresse"
+									:label="$p.t('person', 'adresse')"
 									type="text"
 									id="stv-list-new-address-address"
 									name="address[address]"
@@ -505,7 +524,7 @@ export default {
 					<div class="row">
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Geburtsnation"
+								:label="$p.t('person', 'geburtsnation')"
 								type="select"
 								id="stv-list-new-geburtsnation"
 								name="geburtsnation" class="form-select"
@@ -516,7 +535,7 @@ export default {
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Staatsbürgerschaft"
+								:label="$p.t('person', 'staatsbuergerschaft')"
 								type="select"
 								id="stv-list-new-staatsbuergerschaft"
 								name="staatsbuergerschaft"
@@ -539,7 +558,7 @@ export default {
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Telefon"
+								:label="$p.t('person', 'telefon')"
 								type="text"
 								id="stv-list-new-telefon"
 								name="telefon"
@@ -549,7 +568,7 @@ export default {
 						</div>
 						<div class="col-sm-4 mb-3">
 							<form-input
-								label="Mobil"
+								:label="$p.t('person', 'mobil')"
 								type="text"
 								id="stv-list-new-mobil"
 								name="mobil"
@@ -558,126 +577,128 @@ export default {
 							</form-input>
 						</div>
 					</div>
-					<div class="row">
-						<div class="col-sm-4 mb-3">
-							<form-input
-								label="Letzte Ausbildung"
-								type="select"
-								id="stv-list-new-letzteausbildung"
-								name="letzteausbildung"
-								v-model="formData['letzteausbildung']"
-								>
-								<option v-for="ausbildung in lists.ausbildungen" :key="ausbildung.ausbildungcode" :value="ausbildung.ausbildungcode">{{ausbildung.ausbildungbez}}</option>
-							</form-input>
-						</div>
-						<div class="col-sm-4 mb-3">
-							<form-input
-								label="Ausbildungsart"
-								type="text"
-								id="stv-list-new-ausbildungsart"
-								name="ausbildungsart"
-								v-model="formDataPerson['ausbildungsart']"
-								>
-							</form-input>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-sm-8 mb-3">
-							<form-input
-								label="Anmerkungen"
-								type="textarea"
-								id="stv-list-new-anmerkungen"
-								name="anmerkungen"
-								v-model="formDataPerson['anmerkungen']"
-								>
-							</form-input>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-sm-4 mb-3">
-							<form-input
-								label="Studiengang*"
-								type="select"
-								id="stv-list-new-studiengang_kz"
-								name="studiengang_kz"
-								v-model="formDataStg"
-								>
-								<option v-for="stg in lists.active_stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}}</option>
-							</form-input>
-						</div>
-						<div class="col-sm-4 mb-3">
-							<form-input
-								label="Studiensemester*"
-								type="select"
-								id="stv-list-new-studiensemester_kurzbz"
-								name="studiensemester_kurzbz"
-								v-model="formDataSem"
-								>
-								<option v-for="sem in semester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
-							</form-input>
-						</div>
-						<div class="col-sm-4 mb-3">
-							<form-input
-								label="Ausbildungssemester*"
-								type="select"
-								id="stv-list-new-ausbildungssemester"
-								name="ausbildungssemester"
-								v-model="formData['ausbildungssemester']"
-								:disabled="formData['incoming']"
-								@input="loadStudienplaene"
-								>
-								<option v-for="sem in Array.from({length:8}).map((u,i) => i+1)" :key="sem" :value="sem">{{sem}}. Semester</option>
-							</form-input>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-sm-4 mb-3">
-							<form-input
-								label="OrgForm"
-								type="select"
-								id="stv-list-new-orgform_kurzbz"
-								name="orgform_kurzbz"
-								v-model="formData['orgform_kurzbz']"
-								@input="loadStudienplaene"
-								>
-								<option value="">-- keine Auswahl --</option>
-								<option v-for="orgform in lists.orgforms" :key="orgform.orgform_kurzbz" :value="orgform.orgform_kurzbz">{{orgform.bezeichnung}}</option>
-							</form-input>
-						</div>
-						<div class="col-sm-4 mb-3">
-							<form-input
-								label="Studienplan"
-								type="select"
-								id="stv-list-new-studienplan_id"
-								name="studienplan_id"
-								v-model="formData['studienplan_id']"
-								>
-								<option value="">-- keine Auswahl --</option>
-								<option v-for="plan in studienplaene" :key="plan.studienplan_id" :value="plan.studienplan_id">{{plan.bezeichnung}}</option>
-							</form-input>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-10 mb-3">
-							<div class="form-check">
+					<fieldset v-if="!personOnly">
+						<div class="row">
+							<div class="col-sm-4 mb-3">
 								<form-input
-									label="Incoming"
-									type="checkbox"
-									id="stv-list-new-incoming"
-									name="incoming"
-									v-model="formData['incoming']"
-									value="1"
+									:label="$p.t('lehre', 'letzeAusbildung')"
+									type="select"
+									id="stv-list-new-letzteausbildung"
+									name="letzteausbildung"
+									v-model="formData['letzteausbildung']"
+									>
+									<option v-for="ausbildung in lists.ausbildungen" :key="ausbildung.ausbildungcode" :value="ausbildung.ausbildungcode">{{ausbildung.ausbildungbez}}</option>
+								</form-input>
+							</div>
+							<div class="col-sm-4 mb-3">
+								<form-input
+									:label="$p.t('lehre', 'ausbildungsart')"
+									type="text"
+									id="stv-list-new-ausbildungsart"
+									name="ausbildungsart"
+									v-model="formDataPerson['ausbildungsart']"
 									>
 								</form-input>
 							</div>
 						</div>
-					</div>
+						<div class="row">
+							<div class="col-sm-8 mb-3">
+								<form-input
+									:label="$p.t('lehre', 'anmerkungen')"
+									type="textarea"
+									id="stv-list-new-anmerkungen"
+									name="anmerkungen"
+									v-model="formDataPerson['anmerkungen']"
+									>
+								</form-input>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-sm-4 mb-3">
+								<form-input
+									:label="$p.t('lehre', 'studiengang')+'*'"
+									type="select"
+									id="stv-list-new-studiengang_kz"
+									name="studiengang_kz"
+									v-model="formDataStg"
+									>
+									<option v-for="stg in lists.active_stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}}</option>
+								</form-input>
+							</div>
+							<div class="col-sm-4 mb-3">
+								<form-input
+									:label="$p.t('lehre', 'studiensemester')+'*'"
+									type="select"
+									id="stv-list-new-studiensemester_kurzbz"
+									name="studiensemester_kurzbz"
+									v-model="formDataSem"
+									>
+									<option v-for="sem in semester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
+								</form-input>
+							</div>
+							<div class="col-sm-4 mb-3">
+								<form-input
+									:label="$p.t('lehre', 'ausbildungssemester')+'*'"
+									type="select"
+									id="stv-list-new-ausbildungssemester"
+									name="ausbildungssemester"
+									v-model="formData['ausbildungssemester']"
+									:disabled="formData['incoming']"
+									@input="loadStudienplaene"
+									>
+									<option v-for="sem in Array.from({length:8}).map((u,i) => i+1)" :key="sem" :value="sem">{{sem}}. Semester</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-sm-4 mb-3">
+								<form-input
+									:label="$p.t('lehre', 'organisationsform')"
+									type="select"
+									id="stv-list-new-orgform_kurzbz"
+									name="orgform_kurzbz"
+									v-model="formData['orgform_kurzbz']"
+									@input="loadStudienplaene"
+									>
+									<option value="">-- keine Auswahl --</option>
+									<option v-for="orgform in lists.orgforms" :key="orgform.orgform_kurzbz" :value="orgform.orgform_kurzbz">{{orgform.bezeichnung}}</option>
+								</form-input>
+							</div>
+							<div class="col-sm-4 mb-3">
+								<form-input
+									:label="$p.t('lehre', 'studienplan')"
+									type="select"
+									id="stv-list-new-studienplan_id"
+									name="studienplan_id"
+									v-model="formData['studienplan_id']"
+									>
+									<option value="">-- keine Auswahl --</option>
+									<option v-for="plan in studienplaene" :key="plan.studienplan_id" :value="plan.studienplan_id">{{plan.bezeichnung}}</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-10 mb-3">
+								<div class="form-check">
+									<form-input
+										label="Incoming"
+										type="checkbox"
+										id="stv-list-new-incoming"
+										name="incoming"
+										v-model="formData['incoming']"
+										value="1"
+										>
+									</form-input>
+								</div>
+							</div>
+						</div>
+					</fieldset>
 				</template>
 			</template>
 			<template #footer>
-				<button v-if="person !== null" type="button" class="btn btn-secondary" @click="person = null"><i class="fa fa-chevron-left"></i>Zurück</button>
-				<button type="submit" class="btn btn-primary">{{ person === null ? 'Person anlegen' : 'InteressentIn anlegen' }}</button>
+				<button v-if="person !== null" type="button" class="btn btn-secondary" @click="person = null; formData.address.func = 1;"><i class="fa fa-chevron-left"></i>{{ $p.t('ui', 'zurueck') }}</button>
+				<button type="submit" class="btn btn-primary">{{ person === null || personOnly ? $p.t('person', 'personAnlegen') : $p.t('lehre', 'interessentAnlegen') }}</button>
 			</template>
 		</bs-modal>
 	</fhc-form>`
-};
\ No newline at end of file
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index a4381b00d..433a52d3e 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41789,7 +41789,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Title',
+				'text' => 'title',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41809,7 +41809,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Title English',
+				'text' => 'title English',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41829,7 +41829,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Topic area',
+				'text' => 'topic area',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41849,7 +41849,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Type',
+				'text' => 'type',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41869,7 +41869,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Company',
+				'text' => 'company',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41889,7 +41889,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Course',
+				'text' => 'course',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41909,7 +41909,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Teaching unit',
+				'text' => 'teaching unit',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41920,6 +41920,26 @@ and represent the current state of research on the topic. The prescribed citatio
 		'category' => 'projektarbeit',
 		'phrase' => 'betreuer',
 		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betreuer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'assessor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'betreuerGross',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -41935,6 +41955,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'betreuerart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betreuerart',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'assessor type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'projektarbeit',
@@ -41949,7 +41989,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Grade',
+				'text' => 'grade',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41969,7 +42009,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Hours',
+				'text' => 'hours',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41989,7 +42029,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Hourly rate',
+				'text' => 'hourly rate',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42029,7 +42069,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Start',
+				'text' => 'start',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42049,7 +42089,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'End',
+				'text' => 'end',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42089,7 +42129,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Locked until',
+				'text' => 'locked until',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42109,7 +42149,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Annotation',
+				'text' => 'annotation',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42129,7 +42169,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Company Id',
+				'text' => 'company Id',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42215,6 +42255,326 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'neuePersonAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Person anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create new person',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'titelPre',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Titel (Pre)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'title (Pre)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'titelPost',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Titel (Post)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'title (Post)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'weitereVornamen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Weitere Vornamen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'other first names',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'bestehendeAdresseUeberschreiben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestehende Adresse überschreiben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Replace existing address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'adresseHinzufuegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Adresse hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add new address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'adresseNichtAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Adresse nicht anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Do not create address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'land',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Land',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'nation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'mobil',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mobil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'mobile phone',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'letzeAusbildung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Letzte Ausbildung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'most recent education',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'ausbildungsart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausbildungsart',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'education type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'anmerkungen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmerkungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'notes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'personAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Person anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create person',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'interessentAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'InteressentIn anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create candidate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'personExistiertPruefung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prüfung ob Person bereits existiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Check if a person already exists',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'zurueck',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zurück',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Back',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 750b956dd22ce736fe8341312ec141dad0265cad Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 2 Jun 2025 15:28:10 +0200
Subject: [PATCH 009/101] Studentenverwaltung Projektarbeit: added button for
 editing contact data

---
 .../Details/Projektarbeit/Projektbetreuer.js  | 31 +++++++++++++++++--
 system/phrasesupdate.php                      | 20 ++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 079b8b796..4f3095cab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -1,18 +1,22 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import NewPerson from "../../List/New.js";
+import Contact from "../Kontakt/Contact.js";
 
 import ApiStvProjektbetreuer from '../../../../../api/factory/stv/projektbetreuer.js';
 
 export default {
 	components: {
 		CoreFilterCmpt,
+		BsModal,
 		FormForm,
 		FormInput,
 		PvAutoComplete,
-		NewPerson
+		NewPerson,
+		Contact
 	},
 	inject: {
 	},
@@ -340,6 +344,10 @@ export default {
 			this.$refs.newPersonModal.reset();
 			this.$refs.newPersonModal.open();
 		},
+		actionKontaktdatenBearbeiten() {
+			if (!this.autocompleteSelectedBetreuer) return;
+			this.$refs.kontaktdatenModal.show();
+		},
 		personSaved(result) {
 			this.$api
 				.call(ApiStvProjektbetreuer.getPerson(result.person_id))
@@ -384,9 +392,12 @@ export default {
 			</div>
 
 			<div class="row mb-3">
-				<div class="col-12">
+				<div class="col-6">
 					<button class="btn btn-primary" @click="actionNewPerson">{{ $p.t('projektarbeit', 'neuePersonAnlegen') }}</button>
 				</div>
+				<div class="col-6">
+					<button class="btn btn-primary float-end" @click="actionKontaktdatenBearbeiten">{{ $p.t('projektarbeit', 'kontaktdatenBearbeiten') }}</button>
+				</div>
 			</div>
 
 			<div class="row mb-3">
@@ -455,6 +466,22 @@ export default {
 		</button>
 
 		<new-person ref="newPersonModal" :personOnly="true" @saved="personSaved"></new-person>
+
+		<!--Modal: KontaktdatenModal -->
+		<bs-modal ref="kontaktdatenModal" dialog-class="modal-xl modal-dialog-scrollable" v-if="autocompleteSelectedBetreuer">
+
+			<template #title>
+				<p class="fw-bold mt-3">{{$p.t('projektarbeit', 'kontaktdatenBearbeiten')}}</p>
+			</template>
+
+			<div class="row">
+				<div class="col-12">
+					<contact ref="contact" :uid="autocompleteSelectedBetreuer.person_id">
+					</contact>
+				</div>
+			</div>
+
+		</bs-modal>
 	</div>
 `
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 433a52d3e..d467252d7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42575,6 +42575,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'kontaktdatenBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontaktdaten bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit contact data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );
 
 

From fe81e7fb7c5bb528f911d315bd64c28c894fb0e6 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 3 Jun 2025 21:18:03 +0200
Subject: [PATCH 010/101] Studierendenverwaltung Projektarbeit: added button
 for Projektarbeit download

---
 .../api/frontend/v1/stv/Projektbetreuer.php   |  26 +-
 .../Details/Projektarbeit/Projektbetreuer.js  | 251 ++++++++++--------
 system/phrasesupdate.php                      |  20 ++
 3 files changed, 171 insertions(+), 126 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index 34f626eca..7a1b803b9 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -3,6 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use \DateTime as DateTime;
+use CI3_Events as Events;
 
 class Projektbetreuer extends FHCAPI_Controller
 {
@@ -85,6 +86,21 @@ class Projektbetreuer extends FHCAPI_Controller
 			//~ }
 		//~ }
 
+		foreach ($projektbetreuer as $pb)
+		{
+			$downloadLink = null;
+			Events::trigger(
+				'projektbeurteilung_download_link',
+				$pb->projektarbeit_id,
+				$pb->betreuerart_kurzbz,
+				$pb->person_id,
+				function ($value) use (&$downloadLink) {
+					$downloadLink = $value;
+				}
+			);
+			$pb->projektarbeitDownload = $downloadLink;
+		}
+
 		$this->terminateWithSuccess($this->_addFullNameToBetreuer($projektbetreuer));
 	}
 
@@ -105,11 +121,7 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		foreach ($projektbetreuer as $pb)
 		{
-			if ($this->_validate($pb) == false)
-			{
-				$this->addMeta('test', 'foisch');
-				$this->terminateWithValidationErrors($this->form_validation->error_array());
-			}
+			if ($this->_validate($pb) == false) $this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
 		$result = null;
@@ -210,10 +222,6 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		$result = $this->StundensatzModel->getStundensatzForMitarbeiter($person_id, $studiensemester_kurzbz);
 
-		$this->addMeta('res', $result);
-
-		//if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
 		return $this->terminateWithSuccess($result);
 	}
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 4f3095cab..bf459ebc5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -113,6 +113,7 @@ export default {
 			arrNoten: [],
 			filteredBetreuer: [],
 			autocompleteSelectedBetreuer: null,
+			projektarbeitDownload: null,
 			abortController: {
 				betreuer: null
 			}
@@ -146,6 +147,7 @@ export default {
 					if (idx >= 0) {
 						betreuer = projektbetreuerListe[idx];
 						this.formData = betreuer;
+						if (betreuer.projektarbeitDownload) this.projektarbeitDownload = betreuer.projektarbeitDownload
 						this.autocompleteSelectedBetreuer = {
 							person_id: this.formData.person_id,
 							name: this.formData.name,
@@ -268,6 +270,7 @@ export default {
 		},
 		resetForm() {
 			this.formData = this.getDefaultFormData();
+			this.projektarbeitDownload = null;
 			this.autocompleteSelectedBetreuer = null;
 			this.initialFormData = null;
 			if (this.projekttyp_kurzbz) this.setDefaultStunden(this.projekttyp_kurzbz);
@@ -358,130 +361,144 @@ export default {
 		}
 	},
 	template: `
-	<div class="stv-details-projektbetreuer h-100 pb-3">
+	<div class="stv-details-projektbetreuer h-100 pb-3 row">
 
-		<legend>{{this.$p.t('projektarbeit','betreuerGross')}}</legend>
-		<!-- <p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p> -->
+		<div class="col-8">
 
-		<core-filter-cmpt
-			ref="projektbetreuerTable"
-			:tabulator-options="tabulatorOptions"
-			:tabulator-events="tabulatorEvents"
-			table-only
-			:side-menu="false"
-			new-btn-show
-			:new-btn-label="this.$p.t('projektarbeit', 'betreuerGross')"
-			@click:new="actionNewProjektbetreuer"
-			>
-		</core-filter-cmpt>
+			<legend>{{this.$p.t('projektarbeit','betreuerGross')}}</legend>
+			<!-- <p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p> -->
 
-		<form-form ref="formProjektbetreuer" v-show="betreuerFormOpened" @submit.prevent>
-			<div class="row mb-3">
-				<form-input
-					container-class="stv-details-projektarbeit-betreuer"
-					:label="$p.t('projektarbeit', 'betreuer')"
-					type="autocomplete"
-					optionLabel="name"
-					v-model="autocompleteSelectedBetreuer"
-					name="betreuer"
-					:suggestions="filteredBetreuer"
-					@complete="searchBetreuer"
-					:min-length="3"
-					>
-				</form-input>
-			</div>
+			<core-filter-cmpt
+				ref="projektbetreuerTable"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				new-btn-show
+				:new-btn-label="this.$p.t('projektarbeit', 'betreuerGross')"
+				@click:new="actionNewProjektbetreuer"
+				>
+			</core-filter-cmpt>
 
-			<div class="row mb-3">
-				<div class="col-6">
-					<button class="btn btn-primary" @click="actionNewPerson">{{ $p.t('projektarbeit', 'neuePersonAnlegen') }}</button>
-				</div>
-				<div class="col-6">
-					<button class="btn btn-primary float-end" @click="actionKontaktdatenBearbeiten">{{ $p.t('projektarbeit', 'kontaktdatenBearbeiten') }}</button>
-				</div>
-			</div>
-
-			<div class="row mb-3">
-				<form-input
-					container-class="col-6 stv-details-projektbetreuer-betreuerart"
-					:label="$p.t('projektarbeit', 'betreuerart')"
-					type="select"
-					v-model="formData.betreuerart_kurzbz"
-					name="betreuerart_kurzbz"
-					>
-					<option
-						v-for="art in arrBetreuerart"
-						:key="art.betreuerart_kurzbz"
-						:value="art.betreuerart_kurzbz"
+			<form-form ref="formProjektbetreuer" v-show="betreuerFormOpened" @submit.prevent>
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektarbeit-betreuer"
+						:label="$p.t('projektarbeit', 'betreuer')"
+						type="autocomplete"
+						optionLabel="name"
+						v-model="autocompleteSelectedBetreuer"
+						name="betreuer"
+						:suggestions="filteredBetreuer"
+						@complete="searchBetreuer"
+						:min-length="3"
 						>
-						{{art.beschreibung}}
-					</option>
-				</form-input>
-			</div>
-
-			<div class="row mb-3">
-				<form-input
-					container-class="col-8 stv-details-projektbetreuer-note"
-					:label="$p.t('projektarbeit', 'note')"
-					type="select"
-					v-model="formData.note"
-					name="note"
-					>
-					<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
-					<option
-						v-for="note in arrNoten"
-						:key="note.note"
-						:value="note.note"
-						>
-						{{note.bezeichnung}}
-					</option>
-				</form-input>
-			</div>
-
-			<div class="row mb-3">
-				<form-input
-					container-class="stv-details-projektarbeit-stunden"
-					type="text"
-					name="stunden"
-					:label="$p.t('projektarbeit', 'stunden')"
-					v-model="formData.stunden"
-					>
-				</form-input>
-			</div>
-
-			<div class="row mb-3">
-				<form-input
-					container-class="stv-details-projektarbeit-stundensatz"
-					type="text"
-					name="stundensatz"
-					:label="$p.t('projektarbeit', 'stundensatz')"
-					v-model="formData.stundensatz"
-					>
-				</form-input>
-			</div>
-
-		</form-form>
-
-		<button class="btn btn-primary" v-show="betreuerFormOpened" @click="confirmProjektbetreuerAfterValidation">
-			{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}
-		</button>
-
-		<new-person ref="newPersonModal" :personOnly="true" @saved="personSaved"></new-person>
-
-		<!--Modal: KontaktdatenModal -->
-		<bs-modal ref="kontaktdatenModal" dialog-class="modal-xl modal-dialog-scrollable" v-if="autocompleteSelectedBetreuer">
-
-			<template #title>
-				<p class="fw-bold mt-3">{{$p.t('projektarbeit', 'kontaktdatenBearbeiten')}}</p>
-			</template>
-
-			<div class="row">
-				<div class="col-12">
-					<contact ref="contact" :uid="autocompleteSelectedBetreuer.person_id">
-					</contact>
+					</form-input>
 				</div>
-			</div>
 
-		</bs-modal>
+				<div class="row mb-3">
+					<div class="col-6">
+						<button class="btn btn-primary" @click="actionNewPerson">{{ $p.t('projektarbeit', 'neuePersonAnlegen') }}</button>
+					</div>
+					<div class="col-6">
+						<button class="btn btn-primary float-end" @click="actionKontaktdatenBearbeiten">{{ $p.t('projektarbeit', 'kontaktdatenBearbeiten') }}</button>
+					</div>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektbetreuer-betreuerart"
+						:label="$p.t('projektarbeit', 'betreuerart')"
+						type="select"
+						v-model="formData.betreuerart_kurzbz"
+						name="betreuerart_kurzbz"
+						>
+						<option
+							v-for="art in arrBetreuerart"
+							:key="art.betreuerart_kurzbz"
+							:value="art.betreuerart_kurzbz"
+							>
+							{{art.beschreibung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektbetreuer-note"
+						:label="$p.t('projektarbeit', 'note')"
+						type="select"
+						v-model="formData.note"
+						name="note"
+						>
+						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+						<option
+							v-for="note in arrNoten"
+							:key="note.note"
+							:value="note.note"
+							>
+							{{note.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektarbeit-stunden"
+						type="text"
+						name="stunden"
+						:label="$p.t('projektarbeit', 'stunden')"
+						v-model="formData.stunden"
+						>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-projektarbeit-stundensatz"
+						type="text"
+						name="stundensatz"
+						:label="$p.t('projektarbeit', 'stundensatz')"
+						v-model="formData.stundensatz"
+						>
+					</form-input>
+				</div>
+
+			</form-form>
+
+			<button class="btn btn-primary" v-show="betreuerFormOpened" @click="confirmProjektbetreuerAfterValidation">
+				{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}
+			</button>
+
+		</div>
+
+		<div class="col-4" v-if="projektarbeitDownload && projektarbeitDownload != ''">
+			<a :href="projektarbeitDownload" class="btn btn-primary">{{ $p.t('projektarbeit', 'projektbeurteilungErstellen') }}</a>
+		</div>
+
 	</div>
+
+	<!--Modal: new Person modal -->
+	<new-person ref="newPersonModal" :personOnly="true" @saved="personSaved"></new-person>
+
+	<!--Modal: KontaktdatenModal -->
+	<bs-modal
+		ref="kontaktdatenModal"
+		dialog-class="modal-xl modal-dialog-scrollable"
+		v-if="autocompleteSelectedBetreuer && autocompleteSelectedBetreuer.person_id"
+	>
+
+		<template #title>
+			<p class="fw-bold mt-3">{{$p.t('projektarbeit', 'kontaktdatenBearbeiten')}}</p>
+		</template>
+
+		<div class="row">
+			<div class="col-12">
+				<contact ref="contact" :uid="autocompleteSelectedBetreuer.person_id">
+				</contact>
+			</div>
+		</div>
+
+	</bs-modal>
 `
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d467252d7..d10f915cc 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42594,6 +42594,26 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'projektbeurteilungErstellen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektbeurteilung erstellen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create project assessment document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 );
 

From e26bce2cf7d21d78e59c09ba16c46097c6d4ef0b Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 10 Jun 2025 14:14:32 +0200
Subject: [PATCH 011/101] removed merge text from code

---
 application/models/ressource/Stundensatz_model.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/models/ressource/Stundensatz_model.php b/application/models/ressource/Stundensatz_model.php
index 553bdd20b..c8ee367d8 100644
--- a/application/models/ressource/Stundensatz_model.php
+++ b/application/models/ressource/Stundensatz_model.php
@@ -150,4 +150,3 @@ class Stundensatz_model extends DB_Model
 		return $default_stundensatz;
 	}
 }
-==== BASE ====

From d15d27b3e14dbbf179fa85e4167b71c09c49c5f0 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 13 Jun 2025 16:19:53 +0200
Subject: [PATCH 012/101] =?UTF-8?q?Studierendenverwaltung=20Projektarbeit:?=
 =?UTF-8?q?=20added=20Vertr=C3=A4ge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/frontend/v1/stv/Config.php            |   6 +-
 .../api/frontend/v1/stv/Projektbetreuer.php   |   2 +-
 .../api/frontend/v1/stv/Vertrag.php           | 104 +++++++++++
 .../models/accounting/Vertrag_model.php       |  20 +++
 public/js/api/factory/stv/vertrag.js          |  20 +++
 .../Details/Projektarbeit/Details.js          |   6 +-
 .../Details/Projektarbeit/Projektarbeit.js    |  24 ---
 .../Details/Projektarbeit/Projektbetreuer.js  | 103 +++++++----
 .../Details/Projektarbeit/Vertrag.js          | 168 ++++++++++++++++++
 system/phrasesupdate.php                      |  68 ++++++-
 10 files changed, 457 insertions(+), 64 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Vertrag.php
 create mode 100644 public/js/api/factory/stv/vertrag.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 98a06ffb5..83173375e 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -127,7 +127,11 @@ class Config extends FHCAPI_Controller
 		$result['projektarbeit'] = [
 			'title' => $this->p->t('stv', 'tab_projektarbeit'),
 			'component' => './Stv/Studentenverwaltung/Details/Projektarbeit.js',
-			'config' => $config['projektarbeit']
+			'config' => array_merge(
+				$config['projektarbeit'],
+				['showVertragsdetails' =>
+					defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN') && FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN]
+			)
 		];
 
 		$result['mobility'] = [
diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index 7a1b803b9..af0a11d0f 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -98,7 +98,7 @@ class Projektbetreuer extends FHCAPI_Controller
 					$downloadLink = $value;
 				}
 			);
-			$pb->projektarbeitDownload = $downloadLink;
+			$pb->beurteilungDownloadLink = $downloadLink;
 		}
 
 		$this->terminateWithSuccess($this->_addFullNameToBetreuer($projektbetreuer));
diff --git a/application/controllers/api/frontend/v1/stv/Vertrag.php b/application/controllers/api/frontend/v1/stv/Vertrag.php
new file mode 100644
index 000000000..f94fe795e
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Vertrag.php
@@ -0,0 +1,104 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Vertrag extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getVertrag' => ['admin:r', 'assistenz:r'],
+			'cancelVertrag' => ['admin:r', 'assistenz:r']
+		]);
+
+		// Load Libraries
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'person',
+			'projektarbeit'
+		]);
+
+		// Load models
+		$this->load->model('accounting/Vertrag_model', 'VertragModel');
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+
+		// load libraries
+		$this->load->library('PermissionLib');
+	}
+
+	public function getVertrag()
+	{
+		$vertrag_id = $this->input->get('vertrag_id');
+
+		if (!isset($vertrag_id) || !is_numeric($vertrag_id))
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Vertrag ID']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->VertragModel->getVertragById($vertrag_id);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$vertrag = getData($result)[0];
+
+		$this->terminateWithSuccess($vertrag);
+	}
+
+	public function cancelVertrag()
+	{
+		$vertrag_id = $this->input->post('vertrag_id');
+		$person_id = $this->input->post('person_id');
+
+		if (!isset($vertrag_id) || !is_numeric($vertrag_id))
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Vertrag ID']), self::ERROR_TYPE_GENERAL);
+		if (!isset($person_id) || !is_numeric($person_id))
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
+
+		// * first find lehrveranstaltung_id of the contracts lehrveranstaltung
+		$this->VertragModel->addSelect('lehrveranstaltung_id');
+		$this->VertragModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id', 'LEFT');
+		$result = $this->VertragModel->loadWhere(['vertrag_id' => $vertrag_id]);
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$lehrveranstaltung_id = getData($result)[0]->lehrveranstaltung_id;
+
+		$allOe = $this->LehrveranstaltungModel->getAllOe($lehrveranstaltung_id);
+
+		if (isError($allOe)) $this->terminateWithError(getError($allOe), self::ERROR_TYPE_GENERAL);
+
+		$allOe = hasData($allOe) ? getData($allOe) : [];
+
+		$this->addMeta('oe', $allOe);
+
+		// * then check if the user has permissions to cancel the corresponding lv-organisational units
+		if (!$this->permissionlib->isBerechtigtMultipleOe('admin', $allOe, 'suid') &&
+			!$this->permissionlib->isBerechtigtMultipleOe('lehre/lehrauftrag_bestellen', $allOe, 'suid'))
+		{
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'lehrauftrag_bestellen:rw']]);
+		}
+
+		$uidResult = $this->BenutzerModel->getFromPersonId($person_id);
+
+		if (isError($uidResult)) $this->terminateWithError(getError($uidResult), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($uidResult)) $this->terminateWithError("no user found", self::ERROR_TYPE_GENERAL);
+
+		$mitarbeiter_uid = getData($uidResult)[0]->uid;
+
+		$result = $this->VertragModel->cancelVertrag($vertrag_id, $mitarbeiter_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index c17c676c7..4c036369b 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -402,6 +402,26 @@ class Vertrag_model extends DB_Model
 		return $this->loadWhere(array('mitarbeiter_uid' => $mitarbeiter_uid, 'lehreinheit_id' => $lehreinheit_id));
 	}
 
+	public function getVertragById($vertrag_id)
+	{
+		$this->addSelect(
+			'tbl_vertrag.vertrag_id, vertragstyp_kurzbz, vertragsstunden, vertragsstunden_studiensemester_kurzbz, status.vertragsstatus_kurzbz,
+			status.bezeichnung AS vertragsstatus, tbl_vertrag.betrag, lema.semesterstunden, lema.stundensatz'
+		);
+		$this->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_vertrag.vertrag_id = lema.vertrag_id', 'LEFT');
+		$this->addJoin('
+			(
+				SELECT DISTINCT ON(vst.vertrag_id) vst.vertrag_id,
+					bezeichnung,
+					tbl_vertragsstatus.vertragsstatus_kurzbz
+				FROM lehre.tbl_vertrag_vertragsstatus vst
+					JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
+				ORDER BY vst.vertrag_id, datum DESC
+			) as status', 'status.vertrag_id = lehre.tbl_vertrag.vertrag_id', 'LEFT');
+
+		return $this->loadWhere(['tbl_vertrag.vertrag_id' => $vertrag_id]);
+	}
+
 	public function cancelVertrag($vertrag_id, $mitarbeiter_uid)
 	{
 		$vertrag = $this->load($vertrag_id);
diff --git a/public/js/api/factory/stv/vertrag.js b/public/js/api/factory/stv/vertrag.js
new file mode 100644
index 000000000..9070936da
--- /dev/null
+++ b/public/js/api/factory/stv/vertrag.js
@@ -0,0 +1,20 @@
+export default {
+
+	getVertrag(vertrag_id)
+	{
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/vertrag/getVertrag',
+			params: { vertrag_id },
+		};
+	},
+
+	cancelVertrag(data)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/stv/vertrag/cancelVertrag/',
+			params: data
+		};
+	}
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index 4f833621d..c2269c1b3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -15,15 +15,13 @@ export default {
 		defaultSemester: {
 			from: 'defaultSemester'
 		}
-		//~ cisRoot: {
-			//~ from: 'cisRoot'
-		//~ },
 		//~ config: {
 			//~ from: 'config',
 			//~ required: true
 		//~ }
 	},
 	computed: {
+		// prepared Lehreinheiten (with compound Bezeichnung)
 		arrLes() {
 			let lehreinheiten = [];
 			if (this.formData.lehrveranstaltung_id) {
@@ -133,7 +131,6 @@ export default {
 						//~ //this.$fhcAlert.handleSystemError(promise_result);
 					//~ }
 					//~ //let data = promise_result.value.data;
-					//~ console.log(promise_result.status);
 				//~ });
 
 				//~ if (!hasError) {
@@ -214,6 +211,7 @@ export default {
 		lvChanged(event) {
 			this.formData.lehreinheit_id = null;
 		},
+		// enrich and modify data before sending
 		getPreparedFormData() {
 			let preparedFormData = JSON.parse(JSON.stringify(this.formData)); // deep copy
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 8314db8b3..3f9958a26 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -30,29 +30,6 @@ export default {
 			from: '$reloadList',
 			required: true
 		}
-		//~ isBerechtigtDocAndOdt: {
-			//~ from: 'hasPermissionOutputformat',
-			//~ default: false
-		//~ }
-	},
-	computed: {
-		//~ studentUids() {
-			//~ if (this.student.uid)
-			//~ {
-				//~ return [this.student.uid];
-			//~ }
-			//~ return this.student.map(e => e.uid);
-		//~ },
-		//~ studentKzs(){
-			//~ if (this.student.uid)
-			//~ {
-				//~ return [this.student.studiengang_kz];
-			//~ }
-			//~ return this.student.map(e => e.studiengang_kz);
-		//~ },
-		//~ stg_kz(){
-			//~ return this.studentKzs.length > 0 ? this.studentKzs.length[0] : null;
-		//~ }
 	},
 	props: {
 		student: Object
@@ -271,7 +248,6 @@ export default {
 		actionEditProjektarbeit(projektarbeit_id, studiensemester_kurzbz, lehrveranstaltung_id, projekttyp_kurzbz) {
 			this.statusNew = false;
 			this.$refs.projektarbeitDetails.getFormData(this.statusNew, studiensemester_kurzbz, lehrveranstaltung_id);
-			// TODO: maybe preload projektarbeit? not just on edit?
 			this.$refs.projektarbeitDetails.loadProjektarbeit(projektarbeit_id);
 			this.$refs.projektbetreuer.getData(projektarbeit_id, studiensemester_kurzbz, projekttyp_kurzbz);
 			this.$refs.projektarbeitModal.show();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index bf459ebc5..8368534c7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -5,6 +5,7 @@ import FormInput from '../../../../Form/Input.js';
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import NewPerson from "../../List/New.js";
 import Contact from "../Kontakt/Contact.js";
+import Vertrag from "./Vertrag.js";
 
 import ApiStvProjektbetreuer from '../../../../../api/factory/stv/projektbetreuer.js';
 
@@ -16,9 +17,13 @@ export default {
 		FormInput,
 		PvAutoComplete,
 		NewPerson,
-		Contact
+		Contact,
+		Vertrag
 	},
-	inject: {
+	provide() {
+		return {
+			configShowVertragsdetails: this.config.showVertragsdetails
+		}
 	},
 	computed: {
 		betreuerFormOpened() {
@@ -107,13 +112,13 @@ export default {
 			initialFormData: null,
 			defaultFormDataValues: {stunden: null, stundensatz: null},
 			projektarbeit_id: null,
-			statusNew: true,
 			editedBetreuerIdx: -1,
 			arrBetreuerart: [],
 			arrNoten: [],
 			filteredBetreuer: [],
 			autocompleteSelectedBetreuer: null,
-			projektarbeitDownload: null,
+			beurteilungDownloadLink: null,
+			vertragFieldsDisabled: false,
 			abortController: {
 				betreuer: null
 			}
@@ -122,19 +127,19 @@ export default {
 	methods: {
 		actionNewProjektbetreuer() {
 			this.resetForm();
-			this.statusNew = true;
 			this.newMode = !this.newMode;
 			this.editMode = false;
 			this.captureFormData();
 		},
 		actionEditProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
-
-			this.statusNew = false;
 			this.editMode = true;
+			this.newMode = false;
 			this.$api
 				.call(ApiStvProjektbetreuer.getDefaultStundensaetze(person_id, this.studiensemester_kurzbz))
 				.then(result => {
 					this.resetForm();
+
+					// get betreuer from tabulator list
 					let projektbetreuerListe = this.$refs.projektbetreuerTable.tabulator.getData();
 					const idx = projektbetreuerListe.findIndex(
 							betr =>
@@ -144,18 +149,29 @@ export default {
 						);
 
 					let betreuer = [];
-					if (idx >= 0) {
+					if (idx >= 0) { // if betreuer found
 						betreuer = projektbetreuerListe[idx];
+
+						// set currently edited betreuera
 						this.formData = betreuer;
-						if (betreuer.projektarbeitDownload) this.projektarbeitDownload = betreuer.projektarbeitDownload
+
+						// set download link
+						if (betreuer.beurteilungDownloadLink) this.beurteilungDownloadLink = betreuer.beurteilungDownloadLink
+
+						// set betreuer for autocomplete field
 						this.autocompleteSelectedBetreuer = {
 							person_id: this.formData.person_id,
 							name: this.formData.name,
 							vorname: this.formData.vorname,
-							nachname: this.formData.nachname
+							nachname: this.formData.nachname,
+							vertrag_id: this.formData.vertrag_id
 						};
 					}
+
+					// set default stundensatz (if no other is set yet)
 					if (this.formData.stundensatz == null) this.formData.stundensatz = result.data;
+
+					// capture initial form data for detecting changes
 					this.captureFormData();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -167,10 +183,12 @@ export default {
 					? {projektarbeit_id, person_id, betreuerart_kurzbz}
 					: Promise.reject({handled: true}))
 				.then(result => {
-					return this.deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz)
+					return this.$api
+						.call(ApiStvProjektbetreuer.deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz))
 				})
 				.then(result => {
 					this.$refs.projektbetreuerTable.tabulator.deleteRow(betreuer_id);
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -178,9 +196,12 @@ export default {
 
 			this.studiensemester_kurzbz = studiensemester_kurzbz;
 
+			// default Stundensätze from config
 			this.defaultFormDataValues.stunden = this.getDefaultStunden(projekttyp_kurzbz);
 			this.defaultFormDataValues.stundensatz = this.config.defaultProjektbetreuerStundensatz;
+			this.resetModes();
 
+			// get other initial data
 			this.$api
 				.call(ApiStvProjektbetreuer.getBetreuerarten())
 				.then(result => {
@@ -209,6 +230,7 @@ export default {
 				this.resetForm();
 			}
 		},
+		// confirming Betreuer means adding/updating him in list (but not yet saving in db)
 		confirmProjektbetreuer() {
 			if (!this.betreuerFormOpened) return;
 
@@ -217,11 +239,9 @@ export default {
 				this.$refs.projektbetreuerTable.tabulator.addData(this.addAutoCompleteBetreuerToFormData(this.formData));
 			} else {
 				this.$refs.projektbetreuerTable.tabulator.updateData([this.formData]);
-				this.statusNew = true;
 			}
 
-			this.newMode = false;
-			this.editMode = false;
+			this.resetModes();
 		},
 		confirmProjektbetreuerAfterValidation() {
 			//if (!this.formDataModified()) return;
@@ -239,14 +259,6 @@ export default {
 				ApiStvProjektbetreuer.saveProjektbetreuer(projektarbeit_id, this.$refs.projektbetreuerTable.tabulator.getData())
 			);
 		},
-		deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
-			return this.$api
-				.call(ApiStvProjektbetreuer.deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-		},
 		searchBetreuer(event) {
 			if (this.abortController.betreuer) {
 				this.abortController.betreuer.abort();
@@ -259,6 +271,7 @@ export default {
 					this.filteredBetreuer = result.data;
 				});
 		},
+		// validate betreuer for data
 		validateProjektbetreuer() {
 			let alleBetreuer = this.$refs.projektbetreuerTable.tabulator.getData();
 
@@ -270,10 +283,15 @@ export default {
 		},
 		resetForm() {
 			this.formData = this.getDefaultFormData();
-			this.projektarbeitDownload = null;
+			this.beurteilungDownloadLink = null;
 			this.autocompleteSelectedBetreuer = null;
 			this.initialFormData = null;
 			if (this.projekttyp_kurzbz) this.setDefaultStunden(this.projekttyp_kurzbz);
+			this.disableVertragFields(false);
+		},
+		resetModes() {
+			this.newMode = false;
+			this.editMode = false;
 		},
 		getDefaultFormData() {
 			let formData = {betreuerart_kurzbz : null, note: null};
@@ -287,6 +305,7 @@ export default {
 		captureFormData() {
 			this.initialFormData = JSON.parse(JSON.stringify(this.formData)); // deep copy
 		},
+		// add own betreuer ids to betreuer liste
 		addIds(betreuerListe) {
 
 			for (const idx in betreuerListe) {
@@ -298,6 +317,7 @@ export default {
 			}
 			return betreuerListe;
 		},
+		// add the betreuer selected in automomplete to betreuer liste
 		addAutoCompleteBetreuerToFormData() {
 			let preparedFormData = this.formData;
 
@@ -311,6 +331,7 @@ export default {
 
 			return preparedFormData;
 		},
+		// get default values for stunden
 		getDefaultStunden(projekttyp_kurzbz) {
 			let stunden = '0.0';
 			if (projekttyp_kurzbz == 'Bachelor') stunden = this.config.defaultProjektbetreuerStunden;
@@ -319,8 +340,10 @@ export default {
 		},
 		setDefaultStunden(projekttyp_kurzbz) {
 			this.projekttyp_kurzbz = projekttyp_kurzbz;
+			// if form data has not already been modified by user, set the default stunden
 			if (!this.formDataModified()) this.formData.stunden = this.getDefaultStunden(projekttyp_kurzbz);
 		},
+		// get a new betreuer id (max + 1) 
 		getNewBetreuerId() {
 			let max = 0;
 
@@ -330,6 +353,7 @@ export default {
 
 			return max + 1;
 		},
+		// check if form data has been modified since initial data has been captured
 		formDataModified() {
 			if (this.autocompleteSelectedBetreuer != null) return true;
 
@@ -351,22 +375,27 @@ export default {
 			if (!this.autocompleteSelectedBetreuer) return;
 			this.$refs.kontaktdatenModal.show();
 		},
+		// stuff to do after new person has been saved
 		personSaved(result) {
 			this.$api
 				.call(ApiStvProjektbetreuer.getPerson(result.person_id))
 				.then(response => {
+					// set the new person in autocomplete field
 					this.autocompleteSelectedBetreuer = response.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError)
+		},
+		// disable fields which are dependent on Vertrag status
+		disableVertragFields(disabled) {
+			this.vertragFieldsDisabled = disabled;
 		}
 	},
 	template: `
 	<div class="stv-details-projektbetreuer h-100 pb-3 row">
 
-		<div class="col-8">
+		<div :class="this.config.showVertragsdetails ? 'col-8' : 'col-12'">
 
 			<legend>{{this.$p.t('projektarbeit','betreuerGross')}}</legend>
-			<!-- <p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p> -->
 
 			<core-filter-cmpt
 				ref="projektbetreuerTable"
@@ -392,6 +421,7 @@ export default {
 						:suggestions="filteredBetreuer"
 						@complete="searchBetreuer"
 						:min-length="3"
+						:disabled="vertragFieldsDisabled"
 						>
 					</form-input>
 				</div>
@@ -448,6 +478,7 @@ export default {
 						type="text"
 						name="stunden"
 						:label="$p.t('projektarbeit', 'stunden')"
+						:disabled="vertragFieldsDisabled"
 						v-model="formData.stunden"
 						>
 					</form-input>
@@ -459,6 +490,7 @@ export default {
 						type="text"
 						name="stundensatz"
 						:label="$p.t('projektarbeit', 'stundensatz')"
+						:disabled="vertragFieldsDisabled"
 						v-model="formData.stundensatz"
 						>
 					</form-input>
@@ -469,11 +501,23 @@ export default {
 			<button class="btn btn-primary" v-show="betreuerFormOpened" @click="confirmProjektbetreuerAfterValidation">
 				{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}
 			</button>
-
+			<div class = "mt-5">
+				<div class="mb-1">
+					<a :href="beurteilungDownloadLink" class="btn btn-primary d-block" :class="{ 'disabled' : !beurteilungDownloadLink || beurteilungDownloadLink == ''}">
+						{{ $p.t('projektarbeit', 'projektbeurteilungErstellen') }}
+					</a>
+				</div>
+				{{ autocompleteSelectedBetreuer?.person_id && (!beurteilungDownloadLink || beurteilungDownloadLink == '') ? $p.t('projektarbeit', 'projektarbeitNochNichtBeurteilt') : ''}}
+			</div>
 		</div>
 
-		<div class="col-4" v-if="projektarbeitDownload && projektarbeitDownload != ''">
-			<a :href="projektarbeitDownload" class="btn btn-primary">{{ $p.t('projektarbeit', 'projektbeurteilungErstellen') }}</a>
+		<div class="col-4">
+			<vertrag ref="vertrag"
+				:vertrag_id="autocompleteSelectedBetreuer?.vertrag_id"
+				:person_id="autocompleteSelectedBetreuer?.person_id"
+				:betreuerProjektarbeit="initialFormData"
+				@vertragsstatusChanged="disableVertragFields">
+			</vertrag>
 		</div>
 
 	</div>
@@ -485,8 +529,7 @@ export default {
 	<bs-modal
 		ref="kontaktdatenModal"
 		dialog-class="modal-xl modal-dialog-scrollable"
-		v-if="autocompleteSelectedBetreuer && autocompleteSelectedBetreuer.person_id"
-	>
+		v-if="autocompleteSelectedBetreuer && autocompleteSelectedBetreuer.person_id">
 
 		<template #title>
 			<p class="fw-bold mt-3">{{$p.t('projektarbeit', 'kontaktdatenBearbeiten')}}</p>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
new file mode 100644
index 000000000..8b43af730
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
@@ -0,0 +1,168 @@
+import CoreForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
+import ApiVertrag from '../../../../../api/factory/stv/vertrag.js';
+
+export default{
+	name: "ProjektarbeitVertrag",
+	components: {
+		CoreForm,
+		FormInput
+	},
+	emits: [
+		'canceledVertrag',
+		'vertragsstatusChanged'
+	],
+	props: {
+		vertrag_id: Number,
+		person_id: Number,
+		betreuerProjektarbeit: Object
+	},
+
+	inject: {
+		showVertragsdetails: {
+			from: 'configShowVertragsdetails',
+			default: false
+		}
+	},
+
+	data() {
+		return{
+			data: {
+				vertragsstatus: null,
+				vertragsstunden: null,
+				vertragsstunden_studiensemester_kurzbz: null
+			},
+			// status names for stages of Vertrag ("constants")
+			vertragsstatus_akzeptiert: 'Akzeptiert',
+			vertragsstatus_geaendert:'Geändert',
+			vertragsstatus_storniert: 'Storniert',
+		}
+	},
+	watch: {
+		vertrag_id:
+		{
+			//deep: true,
+			handler(newVal, oldVal) {
+				this.setDefaultData();
+				if (newVal !== null && newVal !== undefined) this.getVertrag();
+			}
+		},
+	},
+	computed: {
+		vertragsstatus() {
+			// not show Vertragsstatus if no data
+			if (!this.data?.vertragsstatus || !this.betreuerProjektarbeit?.betreuerart_kurzbz) return;
+
+			const betragVertrag = Number(this.data.betrag) || 0;
+			const stundenVertrag = Number(this.data.vertragsstunden) || 0;
+
+			const semStunden = Number(this.betreuerProjektarbeit.stunden) || 0;
+			const stundensatz = Number(this.betreuerProjektarbeit.stundensatz) || 0;
+
+			const kostenAktuell  = semStunden * stundensatz;
+
+			// Vertragsstunden amount should be same as Semesterstunden amount, otherwise there has been a change
+			let vertragsstatus = (stundenVertrag !== semStunden || betragVertrag !== kostenAktuell)
+				? this.vertragsstatus_geaendert
+				: (this.data.vertragsstatus || '');
+
+			// vertragsstatus changed to "akzeptiert"
+			this.$emit('vertragsstatusChanged', vertragsstatus == this.vertragsstatus_akzeptiert);
+
+			return vertragsstatus;
+		},
+	},
+	methods: {
+		getVertrag() {
+			if (this.showVertragsdetails === false)
+				return;
+
+			if (!this.vertrag_id)
+				return;
+
+			this.$api.call(ApiVertrag.getVertrag(this.vertrag_id))
+				.then(result => {
+					this.data = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+
+		cancelVertrag() {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? {vertrag_id: this.vertrag_id, person_id: this.person_id}
+					: Promise.reject({handled: true}))
+				.then(result => {
+					this.$api.call(ApiVertrag.cancelVertrag({vertrag_id: this.vertrag_id, person_id: this.person_id}))
+				})
+				.then(result => {
+					this.setDefaultData();
+					this.$emit('canceledVertrag');
+					// vertragsstatus not  "akzeptiert" anymore
+					this.$emit('vertragsstatusChanged', false);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		setDefaultData() {
+			this.data.vertragsstatus = null;
+			this.data.vertragsstunden = null;
+			this.data.vertragsstunden_studiensemester_kurzbz = null;
+		}
+	},
+	template: `
+		<core-form ref="form">
+			<fieldset class="overflow-hidden" v-if="showVertragsdetails">
+				<legend>
+					{{$p.t('lehre', 'vertragsdetails')}}
+				</legend>
+				<div class="mb-3">
+					{{ betreuerProjektarbeit?.betreuerart_kurzbz && betreuerProjektarbeit?.vertrag_id == null ? ' – '+$p.t('lehre', 'nochKeinVertrag') : '' }}
+				</div>
+				<div class="row align-items-end mb-3">
+					<form-input
+						:label="$p.t('lehre', 'vertragsstatus')"
+						type="text"
+						readonly
+						v-model="vertragsstatus"
+						:style="{fontWeight: vertragsstatus === this.vertragsstatus_geaendert ? 'bold' : 'normal'}"
+						name="vertragsstatus"
+					/>
+				</div>
+				{{$p.t('lehre', 'vertragurfassung')}}
+				<div class="row mb-3">
+					<form-input
+						:label="$p.t('lehre', 'semesterstunden')"
+						type="text"
+						readonly
+						v-model="data.vertragsstunden"
+						name="vertragsstunden"
+						>
+					</form-input>
+				</div>
+				<div class="row mb-3">
+					<form-input
+						:label="$p.t('lehre', 'studiensemester')"
+						type="text"
+						readonly
+						v-model="data.vertragsstunden_studiensemester_kurzbz"
+						name="vertragsstunden_studiensemester_kurzbz"
+						>
+					</form-input>
+				</div>
+				<div class="row mb-3" v-if="data?.vertragsstatus">
+					<div class="col-12">
+						<button
+							type="button"
+							class="btn btn-outline-secondary"
+							:disabled="vertragsstatus == vertragsstatus_storniert"
+							@click="cancelVertrag"
+						>
+							{{ $p.t('lehre', 'stornieren') }}
+						</button>
+					</div>
+				</div>
+			</fieldset>
+		</core-form>
+	`
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ce1edf8b4..db16dc247 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43063,7 +43063,7 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Betreuer',
+				'text' => 'BetreuerIn',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -43083,7 +43083,7 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Betreuer',
+				'text' => 'BetreuerIn',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -43183,7 +43183,7 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Betreuer bestätigen',
+				'text' => 'BetreuerIn bestätigen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -43754,7 +43754,67 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'projektarbeitNochNichtBeurteilt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit ist noch nicht beurteilt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Projekt work was not assessed yet',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'stornieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stornieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Cancel',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'nochKeinVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Noch kein Vertrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No contract yet',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 3e924b62a61daaa13e751c658d4c5d2d60ebd500 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 3 Jul 2025 15:26:03 +0200
Subject: [PATCH 013/101] Studentenverwaltung new person: errors are shown in
 fields, not as popup

---
 public/js/components/Stv/Studentenverwaltung/List/New.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 88de0bc2f..2d9fb0017 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -200,7 +200,7 @@ export default {
 
 			data.personOnly = this.personOnly;
 
-			this.$api.call(
+			this.$refs.form.call(
 				ApiStvStudents.add(data)
 			)
 			.then(result => {

From 549f7867ae8d85280b08368385e39c96d7558b74 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 3 Jul 2025 15:26:53 +0200
Subject: [PATCH 014/101] Kontakt component permission: possible to check if a
 person is neither student nor employee

---
 .../api/frontend/v1/stv/Kontakt.php           |  9 +++---
 application/core/Auth_Controller.php          | 31 +++++++++++++------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index bcd38853c..b635ddf9f 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -50,6 +50,7 @@ class Kontakt extends FHCAPI_Controller
 		// Extra Permissionchecks
 		$permsMa = [];
 		$permsStud = [];
+		$permsDefault = null;
 		switch ($this->router->method) {
 			case 'getBankverbindung':
 			case 'loadBankverbindung':
@@ -66,7 +67,7 @@ class Kontakt extends FHCAPI_Controller
 			case 'getKontakte':
 			case 'loadAddress':
 			case 'loadContact':
-				$permsMa = $permsStud = ['admin:r', 'assistenz:r'];
+				$permsMa = $permsStud = $permsDefault = ['admin:r', 'assistenz:r'];
 				break;
 			case 'addNewAddress':
 			case 'addNewContact':
@@ -74,7 +75,7 @@ class Kontakt extends FHCAPI_Controller
 			case 'updateContact':
 			case 'deleteAddress':
 			case 'deleteContact':
-				$permsMa = $permsStud = ['admin:rw', 'assistenz:rw'];
+				$permsMa = $permsStud = $permsDefault = ['admin:rw', 'assistenz:rw'];
 				break;
 		}
 		if ($this->router->method == 'getAdressen'
@@ -89,7 +90,7 @@ class Kontakt extends FHCAPI_Controller
 			if (is_null($person_id) || !ctype_digit((string)$person_id))
 				$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
-			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud, $permsDefault);
 		} elseif ($this->router->method == 'loadAddress'
 			|| $this->router->method == 'loadContact'
 			|| $this->router->method == 'loadBankverbindung'
@@ -133,7 +134,7 @@ class Kontakt extends FHCAPI_Controller
 
 			$person_id = current($data)->person_id;
 			
-			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud, $permsDefault);
 		}
 	}
 	public function getAdressen($person_id)
diff --git a/application/core/Auth_Controller.php b/application/core/Auth_Controller.php
index 466627fe3..d6c89be57 100644
--- a/application/core/Auth_Controller.php
+++ b/application/core/Auth_Controller.php
@@ -70,20 +70,22 @@ abstract class Auth_Controller extends FHC_Controller
 	/**
 	 * Checks for Permissions depending if the given person is a
 	 * Mitarbeiter and/or Student
+	 * If neither Student nor Mitarbeiter, default permissions are checked
 	 * and exits/outputs an error if they are not met.
 	 *
 	 * @param integer 				$person_id
 	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
 	 * @param array 				$permStud	Perms if the person is a Student
+	 * @param array 				$permDefault	Perms if the person is neither a Student nor a Mitarbeiter
 	 *
 	 * @return void
 	 */
-	protected function checkPermissionsForPerson($person_id, $permMa, $permStud)
+	protected function checkPermissionsForPerson($person_id, $permMa, $permStud, $permDefault = null)
 	{
-		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud);
-		
+		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud, $permDefault);
+
 		if ($res) {
-			$perm = array_keys(array_flip(array_merge($res|1 ? $permMa : [], $res|2 ? $permStud : [])));
+			$perm = array_keys(array_flip(array_merge($res&1 ? $permMa : [], $res&2 ? $permStud : [], $res&4 ? $permDefault : [])));
 			$this->_outputAuthError([$this->router->method => $perm]);
 		}
 	}
@@ -108,16 +110,19 @@ abstract class Auth_Controller extends FHC_Controller
 	 * Checks for Permissions depending if the given person is a
 	 * Mitarbeiter and/or Student
 	 * and returns the result.
-	 *
+	 * If neither Student nor Mitarbeiter, default permissions are checked
+	 * 
 	 * @param integer 				$person_id
 	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
 	 * @param array 				$permStud	Perms if the person is a Student
-	 *
+	 * @param array 				$permDefault	Perms if the person is neither a Student nor a Mitarbeiter
 	 * @return integer				0 if permission is granted
 	 */
-	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
+	protected function hasPermissionsForPerson($person_id, $permMa, $permStud, $permDefault)
 	{
-		$res = 3;
+		$res = 8;
+		$isMitarbeiter = false;
+		$isStudent = false;
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
 		$this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
@@ -125,7 +130,8 @@ abstract class Auth_Controller extends FHC_Controller
 		if (hasData($result)) {
 			if ($this->permissionlib->isEntitled(['a' => $permMa], 'a'))
 				return 0;
-			$res = 1;
+			$isMitarbeiter = true;
+			$res += 1;
 		}
 		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
 		$result = $this->PersonModel->load($person_id);
@@ -140,8 +146,15 @@ abstract class Auth_Controller extends FHC_Controller
 						return 0;
 				}
 			}
+			$isStudent = true;
 			$res += 2;
 		}
+		if (isset($permDefault) && !$isMitarbeiter && !$isStudent)
+		{
+			if ($this->permissionlib->isEntitled(['a' => $permDefault], 'a'))
+				return 0;
+			$res += 4;
+		}
 		return $res;
 	}
 

From abbeec11fce0da6014df90fc21c0f1aaf3486138 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 8 Jul 2025 15:35:46 +0200
Subject: [PATCH 015/101] Studierendenverwaltung Projektarbeit: date value ende
 and gesperrt bis can be saved, full type name is shown in Projektarbeit
 table, made "kontaktdaten bearbeiten" and "person anlegen" buttons less
 prominent, bugfix cancel contract: contract display is updated immediately

---
 .../api/frontend/v1/stv/Projektarbeit.php     | 13 ++++++++--
 .../Details/Projektarbeit/Projektarbeit.js    |  9 ++++---
 .../Details/Projektarbeit/Projektbetreuer.js  |  8 +++----
 .../Details/Projektarbeit/Vertrag.js          | 24 ++++++++++++-------
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index 244dba412..e7d1af1f9 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -86,8 +86,8 @@ class Projektarbeit extends FHCAPI_Controller
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
 
 		$this->ProjektarbeitModel->addSelect(
-			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, firma_id,
-			lehrveranstaltung_id, lehreinheit_id, beginn, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
+			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
+			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
 		);
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
@@ -285,6 +285,14 @@ class Projektarbeit extends FHCAPI_Controller
 			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Beginn'])
 		]);
 
+		$this->form_validation->set_rules('ende', 'Ende', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Ende'])
+		]);
+
+		$this->form_validation->set_rules('gesperrtbis', 'Ende', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Gesperrt bis'])
+		]);
+
 		return $this->form_validation->run();
 	}
 
@@ -303,6 +311,7 @@ class Projektarbeit extends FHCAPI_Controller
 			'firma_id' => $formData['firma_id'] ?? null,
 			'lehreinheit_id' => $formData['lehreinheit_id'],
 			'beginn' => $formData['beginn'] ?? null,
+			'ende' => $formData['ende'] ?? null,
 			'note' => $formData['note'] ?? null,
 			'final' => $formData['final'] ?? null,
 			'freigegeben' => $formData['freigegeben'] ?? null,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 3f9958a26..b159c9293 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -42,7 +42,8 @@ export default {
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Projektarbeit ID", field: "projektarbeit_id", visible: false},
-					{title: "Typ", field: "projekttyp_kurzbz"},
+					{title: "Typ", field: "bezeichnung"},
+					{title: "Typ Kurzbz", field: "projekttyp_kurzbz", visible: false},
 					{title: "Studiensemester", field: "studiensemester_kurzbz"},
 					{title: "Titel", field: "titel"},
 					{
@@ -179,6 +180,10 @@ export default {
 				minHeight: '200',
 				selectable: 1,
 				index: 'projektarbeit_id',
+				//persistenceMode:"cookie",
+				//~ persistence:{
+					//~ columns: true, //persist column layout
+				//~ },
 				persistenceID: 'stv-details-projektarbeit'
 			},
 			tabulatorEvents: [
@@ -325,8 +330,6 @@ export default {
 			this.$refs.table.reloadTable();
 		}
 	},
-	created() {
-	},
 	template: `
 	<div class="stv-details-projektarbeit h-100 pb-3">
 		<h4>{{this.$p.t('stv','tab_projektarbeit')}}</h4>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 8368534c7..fd796e3e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -386,8 +386,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 		},
 		// disable fields which are dependent on Vertrag status
-		disableVertragFields(disabled) {
-			this.vertragFieldsDisabled = disabled;
+		disableVertragFields(statusAkzeptiert) {
+			this.vertragFieldsDisabled = statusAkzeptiert;
 		}
 	},
 	template: `
@@ -428,10 +428,10 @@ export default {
 
 				<div class="row mb-3">
 					<div class="col-6">
-						<button class="btn btn-primary" @click="actionNewPerson">{{ $p.t('projektarbeit', 'neuePersonAnlegen') }}</button>
+						<button class="btn btn-outline-secondary" @click="actionNewPerson">{{ $p.t('projektarbeit', 'neuePersonAnlegen') }}</button>
 					</div>
 					<div class="col-6">
-						<button class="btn btn-primary float-end" @click="actionKontaktdatenBearbeiten">{{ $p.t('projektarbeit', 'kontaktdatenBearbeiten') }}</button>
+						<button class="btn btn-outline-secondary float-end" @click="actionKontaktdatenBearbeiten">{{ $p.t('projektarbeit', 'kontaktdatenBearbeiten') }}</button>
 					</div>
 				</div>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
index 8b43af730..1f494d1ec 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
@@ -35,7 +35,7 @@ export default{
 			// status names for stages of Vertrag ("constants")
 			vertragsstatus_akzeptiert: 'Akzeptiert',
 			vertragsstatus_geaendert:'Geändert',
-			vertragsstatus_storniert: 'Storniert',
+			vertragsstatus_storniert: 'Storno'
 		}
 	},
 	watch: {
@@ -43,7 +43,7 @@ export default{
 		{
 			//deep: true,
 			handler(newVal, oldVal) {
-				this.setDefaultData();
+				this.resetForm();
 				if (newVal !== null && newVal !== undefined) this.getVertrag();
 			}
 		},
@@ -82,7 +82,9 @@ export default{
 
 			this.$api.call(ApiVertrag.getVertrag(this.vertrag_id))
 				.then(result => {
-					this.data = result.data;
+					if (result.data.vertragsstatus != this.vertragsstatus_storniert) {
+						this.data = result.data;
+					}
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -97,17 +99,21 @@ export default{
 					this.$api.call(ApiVertrag.cancelVertrag({vertrag_id: this.vertrag_id, person_id: this.person_id}))
 				})
 				.then(result => {
-					this.setDefaultData();
+					this.resetForm();
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 					this.$emit('canceledVertrag');
-					// vertragsstatus not  "akzeptiert" anymore
+					// vertragsstatus not "akzeptiert" anymore
 					this.$emit('vertragsstatusChanged', false);
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		setDefaultData() {
-			this.data.vertragsstatus = null;
-			this.data.vertragsstunden = null;
-			this.data.vertragsstunden_studiensemester_kurzbz = null;
+		resetForm() {
+			this.data = {
+				vertrag_id: null,
+				vertragsstatus: null,
+				vertragsstunden: null,
+				vertragsstunden_studiensemester_kurzbz: null
+			}
 		}
 	},
 	template: `

From 1c8ffa786ed8c355831d9c1c653b0fbcb7b51dfd Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 10 Jul 2025 16:59:58 +0200
Subject: [PATCH 016/101] Studierendenverwaltung Projektarbeit improvements:
 tabulator (supposedly) stores column changes, changed some phrases,
 projektarbeit download button is now shown when Projektbeurteilung extension
 is not installted, errors are displayed near input fields not in pop up,
 changed modal layout, Vertrag fields are now just text fields, validation
 errors are cleared

---
 .../api/frontend/v1/stv/Projektbetreuer.php   | 12 +++---
 .../Details/Projektarbeit/Details.js          |  1 +
 .../Details/Projektarbeit/Projektarbeit.js    | 13 +++---
 .../Details/Projektarbeit/Projektbetreuer.js  | 27 ++++++++----
 .../Details/Projektarbeit/Vertrag.js          | 42 +++++++------------
 system/phrasesupdate.php                      |  4 +-
 6 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index af0a11d0f..625a30c40 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -168,13 +168,13 @@ class Projektbetreuer extends FHCAPI_Controller
 		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
 
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID'], self::ERROR_TYPE_GENERAL));
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'projektarbeit').' ID'], self::ERROR_TYPE_GENERAL));
 
 		if (!isset($person_id) || !is_numeric($person_id))
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID'], self::ERROR_TYPE_GENERAL));
 
 		if (!isset($betreuerart_kurzbz))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Betreuerart'], self::ERROR_TYPE_GENERAL));
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'betreuerart')], self::ERROR_TYPE_GENERAL));
 
 		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
 			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
@@ -295,19 +295,19 @@ class Projektbetreuer extends FHCAPI_Controller
 		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('betreuerart_kurzbz', 'Betreuerart', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betreuerart'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('projektarbeit', 'betreuerart')])
 		]);
 
 		$this->form_validation->set_rules('person_id', 'Person', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Person ID'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('projektarbeit', 'betreuer')])
 		]);
 
 		$this->form_validation->set_rules('stunden', 'Stunden', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stunden'])
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => $this->p->t('projektarbeit', 'stunden')])
 		]);
 
 		$this->form_validation->set_rules('stundensatz', 'Stundensatz', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stundensatz'])
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' =>  $this->p->t('projektarbeit', 'stundensatz')])
 		]);
 
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index c2269c1b3..e51828f98 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -102,6 +102,7 @@ export default {
 			this.formData.note = null;
 			this.formData.final = true;
 			this.formData.anmerkung = null;
+			this.$refs.formDetails.clearValidation();
 		},
 		getFormData(statusNew, studiensemester_kurzbz, additional_lehrveranstaltung_id/*, successCallback*/) {
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index b159c9293..dd7c4913c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -175,15 +175,14 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
+				//layout: 'fitDataFill',
 				height: 'auto',
 				minHeight: '200',
 				selectable: 1,
 				index: 'projektarbeit_id',
-				//persistenceMode:"cookie",
-				//~ persistence:{
-					//~ columns: true, //persist column layout
-				//~ },
+				persistence:{
+					columns: true, //persist column layout
+				},
 				persistenceID: 'stv-details-projektarbeit'
 			},
 			tabulatorEvents: [
@@ -356,11 +355,11 @@ export default {
 			</template>
 
 			<div class="row">
-				<div class="col-6">
+				<div class="col-5">
 					<projektarbeit-details ref="projektarbeitDetails" :student="student" @projekttyp-changed="setDefaultStunden">
 					</projektarbeit-details>
 				</div>
-				<div class="col-6">
+				<div class="col-7">
 					<projektbetreuer ref="projektbetreuer" :config="config"></projektbetreuer>
 				</div>
 			</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index fd796e3e1..9b02f9b01 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -84,13 +84,16 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
+				//layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: '100',
 				selectable: true,
 				selectable: 1,
 				index: 'betreuer_id',
+				persistence:{
+					columns: true, //persist column layout
+				},
 				persistenceID: 'stv-details-projektbetreuer'
 			},
 			tabulatorEvents: [
@@ -99,6 +102,13 @@ export default {
 					handler: async() => {
 						await this.$p.loadCategory(['global', 'person', 'stv', 'projektarbeit', 'ui']);
 					}
+				},
+				{
+					event: 'rowSelected',
+					handler: row => {
+						let data = row.getData();
+						this.actionEditProjektbetreuer(data.projektarbeit_id, data.person_id, data.betreuerart_kurzbz);
+					}
 				}
 			],
 			formData: {
@@ -156,7 +166,7 @@ export default {
 						this.formData = betreuer;
 
 						// set download link
-						if (betreuer.beurteilungDownloadLink) this.beurteilungDownloadLink = betreuer.beurteilungDownloadLink
+						if (betreuer.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = betreuer.beurteilungDownloadLink;
 
 						// set betreuer for autocomplete field
 						this.autocompleteSelectedBetreuer = {
@@ -279,15 +289,16 @@ export default {
 				alleBetreuer.push(this.addAutoCompleteBetreuerToFormData(this.formData));
 			}
 
-			return this.$api.call(ApiStvProjektbetreuer.validateProjektbetreuer(alleBetreuer));
+			return this.$refs.formProjektbetreuer.call(ApiStvProjektbetreuer.validateProjektbetreuer(alleBetreuer));
 		},
 		resetForm() {
 			this.formData = this.getDefaultFormData();
-			this.beurteilungDownloadLink = null;
+			if (this.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = '';
 			this.autocompleteSelectedBetreuer = null;
 			this.initialFormData = null;
 			if (this.projekttyp_kurzbz) this.setDefaultStunden(this.projekttyp_kurzbz);
 			this.disableVertragFields(false);
+			this.$refs.formProjektbetreuer.clearValidation();
 		},
 		resetModes() {
 			this.newMode = false;
@@ -417,7 +428,7 @@ export default {
 						type="autocomplete"
 						optionLabel="name"
 						v-model="autocompleteSelectedBetreuer"
-						name="betreuer"
+						name="person_id"
 						:suggestions="filteredBetreuer"
 						@complete="searchBetreuer"
 						:min-length="3"
@@ -501,13 +512,13 @@ export default {
 			<button class="btn btn-primary" v-show="betreuerFormOpened" @click="confirmProjektbetreuerAfterValidation">
 				{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}
 			</button>
-			<div class = "mt-5">
+			<div class = "mt-5" v-if="beurteilungDownloadLink !== null">
 				<div class="mb-1">
-					<a :href="beurteilungDownloadLink" class="btn btn-primary d-block" :class="{ 'disabled' : !beurteilungDownloadLink || beurteilungDownloadLink == ''}">
+					<a :href="beurteilungDownloadLink" class="btn btn-primary d-block" :class="{ 'disabled' : beurteilungDownloadLink === ''}">
 						{{ $p.t('projektarbeit', 'projektbeurteilungErstellen') }}
 					</a>
 				</div>
-				{{ autocompleteSelectedBetreuer?.person_id && (!beurteilungDownloadLink || beurteilungDownloadLink == '') ? $p.t('projektarbeit', 'projektarbeitNochNichtBeurteilt') : ''}}
+				{{ autocompleteSelectedBetreuer?.person_id && beurteilungDownloadLink === '' ? $p.t('projektarbeit', 'projektarbeitNochNichtBeurteilt') : ''}}
 			</div>
 		</div>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
index 1f494d1ec..074d22bde 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
@@ -125,36 +125,22 @@ export default{
 				<div class="mb-3">
 					{{ betreuerProjektarbeit?.betreuerart_kurzbz && betreuerProjektarbeit?.vertrag_id == null ? ' – '+$p.t('lehre', 'nochKeinVertrag') : '' }}
 				</div>
-				<div class="row align-items-end mb-3">
-					<form-input
-						:label="$p.t('lehre', 'vertragsstatus')"
-						type="text"
-						readonly
-						v-model="vertragsstatus"
-						:style="{fontWeight: vertragsstatus === this.vertragsstatus_geaendert ? 'bold' : 'normal'}"
-						name="vertragsstatus"
-					/>
-				</div>
-				{{$p.t('lehre', 'vertragurfassung')}}
 				<div class="row mb-3">
-					<form-input
-						:label="$p.t('lehre', 'semesterstunden')"
-						type="text"
-						readonly
-						v-model="data.vertragsstunden"
-						name="vertragsstunden"
-						>
-					</form-input>
+					<div class="col-12">
+						{{ $p.t('lehre', 'vertragsstatus') }}: {{ vertragsstatus }}
+					</div>
 				</div>
 				<div class="row mb-3">
-					<form-input
-						:label="$p.t('lehre', 'studiensemester')"
-						type="text"
-						readonly
-						v-model="data.vertragsstunden_studiensemester_kurzbz"
-						name="vertragsstunden_studiensemester_kurzbz"
-						>
-					</form-input>
+					<div class="col-12">
+						{{$p.t('lehre', 'vertragurfassung')}}
+					</div>
+				</div>
+				<div class="row mb-3">
+					<div class="col-12">
+						{{ $p.t('lehre', 'semesterstunden') }}: {{ data.vertragsstunden }}
+						<br>
+						<span class="text-capitalize">{{ $p.t('lehre', 'studiensemester') }}</span>: {{ data.vertragsstunden_studiensemester_kurzbz }}
+					</div>
 				</div>
 				<div class="row mb-3" v-if="data?.vertragsstatus">
 					<div class="col-12">
@@ -164,7 +150,7 @@ export default{
 							:disabled="vertragsstatus == vertragsstatus_storniert"
 							@click="cancelVertrag"
 						>
-							{{ $p.t('lehre', 'stornieren') }}
+							{{ $p.t('lehre', 'vertragStornieren') }}
 						</button>
 					</div>
 				</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index db16dc247..24b37f594 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43778,7 +43778,7 @@ and represent the current state of research on the topic. The prescribed citatio
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
-		'phrase' => 'stornieren',
+		'phrase' => 'vertragStornieren',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -43789,7 +43789,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Cancel',
+				'text' => 'Cancel contract',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 4eaf71e5c634cfe7a96bdce0b3d5d7a3b423eee6 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 14 Jul 2025 17:01:16 +0200
Subject: [PATCH 017/101] cancel Vertrag: correct error handling

---
 .../Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
index 074d22bde..c5de5a1fb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Vertrag.js
@@ -96,7 +96,7 @@ export default{
 					? {vertrag_id: this.vertrag_id, person_id: this.person_id}
 					: Promise.reject({handled: true}))
 				.then(result => {
-					this.$api.call(ApiVertrag.cancelVertrag({vertrag_id: this.vertrag_id, person_id: this.person_id}))
+					return this.$api.call(ApiVertrag.cancelVertrag({vertrag_id: this.vertrag_id, person_id: this.person_id}))
 				})
 				.then(result => {
 					this.resetForm();

From 1f258c84d4d01aa4db7df27480d8cea3042b7772 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 15 Jul 2025 18:56:49 +0200
Subject: [PATCH 018/101] Studierendenverwaltung Projektarbeit: moved
 Beurteilung download to table actions, separate tabs for details and Betreuer

---
 .../Details/Projektarbeit/Projektarbeit.js    | 34 +++++--
 .../Details/Projektarbeit/Projektbetreuer.js  | 88 +++++++++++++------
 2 files changed, 87 insertions(+), 35 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index dd7c4913c..76953867f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -348,19 +348,39 @@ export default {
 		</core-filter-cmpt>
 
 		<!--Modal: projektarbeitModal-->
-		<bs-modal ref="projektarbeitModal" dialog-class="modal-xl modal-dialog-scrollable">
+		<bs-modal ref="projektarbeitModal" dialog-class="modal-xl modal-dialog-scrollable" header-class="flex-wrap pb-0">
 			<template #title>
 				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('projektarbeit', 'projektarbeitAnlegen')}}</p>
 				<p v-else class="fw-bold mt-3">{{$p.t('projektarbeit', 'projektarbeitBearbeiten')}}</p>
 			</template>
 
-			<div class="row">
-				<div class="col-5">
-					<projektarbeit-details ref="projektarbeitDetails" :student="student" @projekttyp-changed="setDefaultStunden">
-					</projektarbeit-details>
+			<template #modal-header-content>
+				<ul class="nav nav-tabs w-100 mt-3 msg_preview" id="pa_tabs" role="tablist">
+					<li class="nav-item" role="presentation">
+						<button class="nav-link active" id="details-tab" data-bs-toggle="tab" data-bs-target="#details" type="button" role="tab" aria-controls="details" aria-selected="true">Details</button>
+					</li>
+					<li class="nav-item" role="presentation">
+						<button class="nav-link" id="betreuer-tab" data-bs-toggle="tab" data-bs-target="#betreuer" type="button" role="tab" aria-controls="betreuer" aria-selected="false">{{$p.t('projektarbeit', 'betreuerGross')}}</button>
+					</li>
+				</ul>
+			</template>
+
+			<div class="tab-content" id="pa_content">
+				<div class="tab-pane fade show active" id="details" role="tabpanel" aria-labelledby="details-tab">
+					<div class="row">
+						<div class="col-12">
+							<projektarbeit-details ref="projektarbeitDetails" :student="student" @projekttyp-changed="setDefaultStunden">
+							</projektarbeit-details>
+						</div>
+					</div>
 				</div>
-				<div class="col-7">
-					<projektbetreuer ref="projektbetreuer" :config="config"></projektbetreuer>
+
+				<div class="tab-pane fade show" id="betreuer" role="tabpanel" aria-labelledby="betreuer-tab">
+					<div class="row">
+						<div class="col-12">
+							<projektbetreuer ref="projektbetreuer" :config="config"></projektbetreuer>
+						</div>
+					</div>
 				</div>
 			</div>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 9b02f9b01..183c81bc0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -51,7 +51,8 @@ export default {
 					{title: "Vertrag ID", field: "vertrag_id", visible: false},
 					{title: "Projektarbeit ID", field: "projektarbeit_id", visible: false},
 					{
-						title: 'Aktionen', field: 'actions',
+						title: 'Aktionen',
+						field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
 						formatter: (cell, formatterParams, onRendered) => {
 							let container = document.createElement('div');
@@ -62,6 +63,8 @@ export default {
 							button.innerHTML = '<i class="fa fa-edit"></i>';
 							button.title = this.$p.t('ui', 'bearbeiten');
 							button.addEventListener('click', (event) => {
+								event.stopPropagation();
+								event.preventDefault();
 								let data = cell.getData();
 								this.actionEditProjektbetreuer(data.projektarbeit_id, data.person_id, data.betreuerart_kurzbz);
 							});
@@ -71,13 +74,41 @@ export default {
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.title = this.$p.t('ui', 'loeschen');
-							button.addEventListener('click', () => {
+							button.addEventListener('click', (event) => {
+								event.stopPropagation();
+								event.preventDefault();
 								const data = cell.getData();
 								this.actionDeleteProjektbetreuer(data.betreuer_id, data.projektarbeit_id, data.person_id, data.betreuerart_kurzbz)
 							});
 							container.append(button);
 
-							//container.append(cell.getData().actionDiv);
+							let data = cell.getData();
+							if (data.beurteilungDownloadLink !== null) {
+								if (data.beurteilungDownloadLink == '') {
+									button = document.createElement('span');
+									button.title = this.$p.t('projektarbeit', 'projektarbeitNochNichtBeurteilt')
+									button.innerHTML = '<button class="btn btn-outline-secondary btn-action" disabled>'+
+										'<i class="fa-regular fa-file-pdf"></i></button>';
+									button.addEventListener('click', (event) => {
+										event.stopPropagation();
+										event.preventDefault();
+									});
+								}
+								else {
+									button = document.createElement('a');
+									button.setAttribute('href', data.beurteilungDownloadLink);
+									button.setAttribute('role', 'button');
+									button.innerHTML = '<i class="fa fa-file-pdf"></i>';
+									button.title = this.$p.t('projektarbeit', 'projektbeurteilungErstellen');
+									button.className = 'btn btn-outline-secondary btn-action';
+									button.addEventListener('click', (event) => {
+										event.stopPropagation();
+										event.preventDefault();
+										window.location.href = data.beurteilungDownloadLink;
+									});
+								}
+								container.append(button);
+							}
 
 							return container;
 						},
@@ -404,7 +435,7 @@ export default {
 	template: `
 	<div class="stv-details-projektbetreuer h-100 pb-3 row">
 
-		<div :class="this.config.showVertragsdetails ? 'col-8' : 'col-12'">
+		<div :class="this.config.showVertragsdetails ? 'col-9' : 'col-12'">
 
 			<legend>{{this.$p.t('projektarbeit','betreuerGross')}}</legend>
 
@@ -484,27 +515,28 @@ export default {
 				</div>
 
 				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-projektarbeit-stunden"
-						type="text"
-						name="stunden"
-						:label="$p.t('projektarbeit', 'stunden')"
-						:disabled="vertragFieldsDisabled"
-						v-model="formData.stunden"
-						>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-projektarbeit-stundensatz"
-						type="text"
-						name="stundensatz"
-						:label="$p.t('projektarbeit', 'stundensatz')"
-						:disabled="vertragFieldsDisabled"
-						v-model="formData.stundensatz"
-						>
-					</form-input>
+					<div class="col-6">
+						<form-input
+							container-class="stv-details-projektarbeit-stunden"
+							type="text"
+							name="stunden"
+							:label="$p.t('projektarbeit', 'stunden')"
+							:disabled="vertragFieldsDisabled"
+							v-model="formData.stunden"
+							>
+						</form-input>
+					</div>
+					<div class="col-6">
+						<form-input
+							container-class="stv-details-projektarbeit-stundensatz"
+							type="text"
+							name="stundensatz"
+							:label="$p.t('projektarbeit', 'stundensatz')"
+							:disabled="vertragFieldsDisabled"
+							v-model="formData.stundensatz"
+							>
+						</form-input>
+					</div>
 				</div>
 
 			</form-form>
@@ -512,17 +544,17 @@ export default {
 			<button class="btn btn-primary" v-show="betreuerFormOpened" @click="confirmProjektbetreuerAfterValidation">
 				{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}
 			</button>
-			<div class = "mt-5" v-if="beurteilungDownloadLink !== null">
+			<!-- <div class = "mt-5" v-if="beurteilungDownloadLink !== null">
 				<div class="mb-1">
 					<a :href="beurteilungDownloadLink" class="btn btn-primary d-block" :class="{ 'disabled' : beurteilungDownloadLink === ''}">
 						{{ $p.t('projektarbeit', 'projektbeurteilungErstellen') }}
 					</a>
 				</div>
 				{{ autocompleteSelectedBetreuer?.person_id && beurteilungDownloadLink === '' ? $p.t('projektarbeit', 'projektarbeitNochNichtBeurteilt') : ''}}
-			</div>
+			</div> -->
 		</div>
 
-		<div class="col-4">
+		<div class="col-3">
 			<vertrag ref="vertrag"
 				:vertrag_id="autocompleteSelectedBetreuer?.vertrag_id"
 				:person_id="autocompleteSelectedBetreuer?.person_id"

From 01a3dc1fd055a0e594bab1c2b9213532f5001d2b Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 15 Jul 2025 23:08:12 +0200
Subject: [PATCH 019/101] Studierendenverwaltung archiv: removed tabulator
 columns from computed

---
 .../Stv/Studentenverwaltung/Details/Archiv.js | 91 -------------------
 1 file changed, 91 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 41bd222b8..d02b64c18 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -67,97 +67,6 @@ export default {
 		};
 	},
 	computed: {
-		tabulatorColumns() {
-			const columns = [
-				{title: "Akte Id", field: "akte_id", visible: false},
-				{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
-				{title: this.$p.t('stv', 'archiv_description'), field: "bezeichnung"},
-				{title: this.$p.t('stv', 'archiv_creation_date'), field: "erstelltam"},
-				{
-					title: this.$p.t('stv', 'archiv_signiert'),
-					field: "signiert",
-					formatter:"tickCross",
-					hozAlign:"center",
-					formatterParams: {
-						tickElement: '<i class="fa fa-check text-success"></i>',
-						crossElement: '<i class="fa fa-xmark text-danger"></i>'
-					}
-				},
-				{
-					title: "Selfservice",
-					field: "stud_selfservice",
-					formatter:"tickCross",
-					hozAlign:"center",
-					formatterParams: {
-						tickElement: '<i class="fa fa-check text-success"></i>',
-						crossElement: '<i class="fa fa-xmark text-danger"></i>'
-					},
-				},
-				{title: this.$p.t('stv', 'archiv_accepted_on_at'), field: "akzeptiertamum"},
-				{
-					title: this.$p.t('stv', 'archiv_gedruckt'),
-					field: "gedruckt",
-					visible: false,
-					formatter:"tickCross",
-					hozAlign:"center",
-					formatterParams: {
-						tickElement: '<i class="fa fa-check text-success"></i>',
-						crossElement: '<i class="fa fa-xmark text-danger"></i>'
-					}
-				},
-				{
-					title: 'Aktionen', field: 'actions',
-					formatter: (cell, formatterParams, onRendered) => {
-						let container = document.createElement('div');
-						container.className = "d-flex gap-2";
-
-						let downloadButton = document.createElement('button');
-						downloadButton.className = 'btn btn-outline-secondary';
-						downloadButton.innerHTML = '<i class="fa fa-download"></i>';
-						downloadButton.title = this.$p.t('ui', 'downloadDok');
-						downloadButton.addEventListener('click', evt => {
-							evt.stopPropagation();
-							this.actionDownload(cell.getData().akte_id);
-						});
-						container.append(downloadButton);
-
-						if (this.config.showEdit)
-						{
-							let editButton = document.createElement('button');
-							editButton.className = 'btn btn-outline-secondary';
-							editButton.innerHTML = '<i class="fa fa-edit"></i>';
-							editButton.addEventListener('click', () =>
-								this.$refs.edit.open(cell.getData())
-							);
-							container.append(editButton);
-						}
-
-						let deleteButton = document.createElement('button');
-						deleteButton.className = 'btn btn-outline-secondary';
-						deleteButton.innerHTML = '<i class="fa fa-trash"></i>';
-						deleteButton.addEventListener('click', evt => {
-							evt.stopPropagation();
-							this.$fhcAlert
-								.confirmDelete()
-								.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz: this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
-								.then(this.$fhcApi.factory.stv.archiv.delete)
-								.then(() => {
-									//cell.getRow().delete();
-									this.reload();
-								})
-								.catch(this.$fhcAlert.handleSystemError);
-						});
-						container.append(deleteButton);
-
-						return container;
-					},
-					minWidth: 150, // Ensures Action-buttons will be always fully displayed
-					maxWidth: 150,
-					frozen: true
-				}
-			];
-			return columns;
-		},
 		tabulatorOptions() {
 			const options = {
 				ajaxURL: 'dummy',

From 75adcefd5168f2b3da82d7fa19aaeb7eb6343821 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 21 Jul 2025 17:52:21 +0200
Subject: [PATCH 020/101] Studentenverwaltung Projektarbeit: made text input
 possible for all date input

---
 .../Studentenverwaltung/Details/Projektarbeit/Details.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index e51828f98..2fdc9d996 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -350,7 +350,10 @@ export default {
 						v-model="formData.beginn"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
+						locale="de"
 						format="dd.MM.yyyy"
+						model-type="yyyy-MM-dd"
 						name="beginn"
 						>
 					</form-input>
@@ -361,7 +364,10 @@ export default {
 						v-model="formData.ende"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
+						locale="de"
 						format="dd.MM.yyyy"
+						model-type="yyyy-MM-dd"
 						name="ende"
 						>
 					</form-input>
@@ -375,7 +381,10 @@ export default {
 						v-model="formData.gesperrtbis"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
+						locale="de"
 						format="dd.MM.yyyy"
+						model-type="yyyy-MM-dd"
 						name="gesperrtbis"
 						>
 					</form-input>

From ca3f8bc554a71c5ebd66f61ec1750b6a821b0b15 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 19 Aug 2025 11:24:51 +0200
Subject: [PATCH 021/101] move statusofsemester select into shared function

---
 .../api/frontend/v1/stv/Students.php          | 72 ++++---------------
 1 file changed, 12 insertions(+), 60 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 26b5000bb..4bd449715 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -334,18 +334,6 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("'' AS gruppe");
 		$this->addSelectPrioRel();
 
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
@@ -462,18 +450,6 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.gruppe');
 		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
 
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-
 
 		$where = [];
 
@@ -562,18 +538,6 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
 
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-
 		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
@@ -631,18 +595,6 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
 
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-
 		$this->addSelectPrioRel();
 
 
@@ -696,18 +648,6 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
 
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-
 		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
@@ -772,6 +712,18 @@ class Students extends FHCAPI_Controller
 		// verband
 		// gruppe
 
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
 		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');

From 6ee3f1d241a2f9f4360dfcfe8cb4ed892e0069d2 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 20 Aug 2025 11:32:31 +0200
Subject: [PATCH 022/101] show Bezeichnung in Subject Vorlage, add adaption for
 Tinymce for openMode inSamePage

---
 .../api/frontend/v1/messages/Messages.php     | 18 ++++------
 public/js/api/factory/messages/messages.js    |  4 +--
 public/js/api/messages/person.js              |  4 +--
 .../Messages/Details/NewMessage/Modal.js      | 19 ++++-------
 .../Messages/Details/NewMessage/NewDiv.js     | 34 ++++++-------------
 5 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index fa6748f6a..6ca1c74c0 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -16,7 +16,7 @@ class Messages extends FHCAPI_Controller
 			'getNameOfDefaultRecipient' => ['admin:r', 'assistenz:r'],
 			'sendMessage' => ['admin:r', 'assistenz:r'],
 			'deleteMessage' => ['admin:r', 'assistenz:r'],
-			'getVorlagentext' => ['admin:r', 'assistenz:r'],
+			'getDataVorlage' => ['admin:r', 'assistenz:r'],
 			'getPreviewText' => ['admin:r', 'assistenz:r'],
 			'getReplyData' => ['admin:r', 'assistenz:r'],
 			'getPersonId' => ['admin:r', 'assistenz:r'],
@@ -89,10 +89,8 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getVorlagentext($vorlage_kurzbz)
+	public function getDataVorlage($vorlage_kurzbz)
 	{
-		//$this->terminateWithError("vor " . $vorlage_kurzbz, self::ERROR_TYPE_GENERAL);
-		//$studiengang_kz = 227; //TODO(Manu) dynamisieren NULL
 		$studiengang_kz = 0;
 		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
 		$this->VorlagestudiengangModel->addOrder('version', 'DESC');
@@ -104,12 +102,8 @@ class Messages extends FHCAPI_Controller
 			]);
 
 		$data = $this->getDataOrTerminateWithError($result);
-
-		//not correct with Vorlage
 		$vorlage = current($data);
-
-		//$this->terminateWithSuccess($data);
-		$this->terminateWithSuccess($vorlage->text);
+		$this->terminateWithSuccess($vorlage);
 	}
 
 	public function getMessageVarsPerson($id, $typeId)
@@ -154,7 +148,7 @@ class Messages extends FHCAPI_Controller
 	public function sendMessage($recipient_id)
 	{
 		//has to be uid
-	//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
+		//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
 
 		//default setting
 		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
@@ -223,7 +217,7 @@ class Messages extends FHCAPI_Controller
 		}
 		elseif($typeId == 'prestudent_id')
 		{
-		//	$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
+			//	$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
 
 			$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
 			$bodyParsed = $this->getDataOrTerminateWithError($result);
@@ -429,7 +423,7 @@ class Messages extends FHCAPI_Controller
 
 	private function _getPrestudentIdFromUid($uid)
 	{
-	//	$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
+		//	$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->loadWhere(
 			['student_uid' => $uid]
diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js
index cec34ad8b..c6d4b67b6 100644
--- a/public/js/api/factory/messages/messages.js
+++ b/public/js/api/factory/messages/messages.js
@@ -62,10 +62,10 @@ export default {
 			url: 'api/frontend/v1/messages/messages/getUid/' + userParams.id + '/' + userParams.type_id
 		};
 	},
-	getVorlagentext(vorlage_kurzbz){
+	getDataVorlage(vorlage_kurzbz){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz
+			url: 'api/frontend/v1/messages/messages/getDataVorlage/' + vorlage_kurzbz
 		};
 	},
 	getNameOfDefaultRecipient(params){
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index e2d2fd0c4..19b3603e2 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -20,8 +20,8 @@ export default {
 		getUid(params){
 			return this.$fhcApi.get('api/frontend/v1/messages/messages/getUid/'+ params.id + '/' + params.type_id);
 		},
-		getVorlagentext(vorlage_kurzbz){
-			return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
+		getDataVorlage(vorlage_kurzbz){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getDataVorlage/' + vorlage_kurzbz);
 		},
 		getNameOfDefaultRecipient(params){
 			return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id);
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index b0d8cca7d..ce9235617 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -136,17 +136,13 @@ export default {
 					}
 				);
 		},
-		getVorlagentext(vorlage_kurzbz){
+		getDataVorlage(vorlage_kurzbz){
 			return this.$api
-				.call(this.endpoint.getVorlagentext(vorlage_kurzbz))
+				.call(this.endpoint.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
-					this.formData.body = response.data;
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					//this.resetForm();
-					//closeModal
-					//closewindwo
-				});
+					this.formData.body = response.data.text;
+					this.formData.subject = response.data.subject;
+				}).catch(this.$fhcAlert.handleSystemError);
 		},
 		getPreviewText(){
 			const data = new FormData();
@@ -197,8 +193,7 @@ export default {
 		},
 		handleSelectedVorlage(vorlage_kurzbz) {
 			if (typeof vorlage_kurzbz === "string") {
-				this.getVorlagentext(vorlage_kurzbz);
-				this.formData.subject = vorlage_kurzbz;
+				this.getDataVorlage(vorlage_kurzbz);
 			}
 		},
 		showPreview(){
@@ -240,7 +235,7 @@ export default {
 			handler(newVal){
 				if (newVal && newVal != null) {
 					this.formData.subject = newVal;
-					return this.getVorlagentext(newVal);
+					return this.getDataVorlage(newVal);
 				}
 			}
 		},
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 7622f0928..24674fd3f 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -136,15 +136,13 @@ export default {
 					}
 				);
 		},
-		getVorlagentext(vorlage_kurzbz){
+		getDataVorlage(vorlage_kurzbz){
 			return this.$api
-				.call(this.endpoint.getVorlagentext(vorlage_kurzbz))
+				.call(this.endpoint.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
-					this.formData.body = response.data;
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					//this.resetForm();
-				});
+					this.formData.body = response.data.text;
+					this.formData.subject = response.data.subject;
+				}).catch(this.$fhcAlert.handleSystemError);
 		},
 		getPreviewText(id, typeId){
 			const data = new FormData();
@@ -164,20 +162,11 @@ export default {
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
-				//TODO(Manu) check: Laden von Variblen geht nicht wenn kein Zeichen danach kommt
-				// nicht mal mit Punkt adden gehts ohne eintrag nach vars
-								//this.editor.focus();
-							//	this.editor.setDirty(true);
 
-				this.editor.setDirty(true);//seting dirty true if changes appear
-			//	console.log(tinyMCE.activeEditor.isDirty());//dirty output  = true
-
-
-				//this.editor.undoManager.add();
-
-				//this.editor.insertContent(selectedItem.value + "\u00A0");
-				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
-				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
+				this.editor.fire('input');
+				this.editor.fire('change');
+				this.editor.setDirty(true);
+				this.editor.save();
 
 			} else {
 				console.error("Editor instance is not available.");
@@ -202,8 +191,7 @@ export default {
 		},
 		handleSelectedVorlage(vorlage_kurzbz) {
 			if (typeof vorlage_kurzbz === "string") {
-				this.getVorlagentext(vorlage_kurzbz);
-				this.formData.subject = vorlage_kurzbz;
+				this.getDataVorlage(vorlage_kurzbz);
 			}
 		},
 		hideTemplate(){
@@ -248,7 +236,7 @@ export default {
 
 				if (newVal && newVal != null) {
 					this.formData.subject = newVal;
-					return this.getVorlagentext(newVal);
+					return this.getDataVorlage(newVal);
 				}
 			}
 		},

From b73eac62b5dd36899ccd96a93f5db6dd59337e5d Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 20 Aug 2025 11:54:01 +0200
Subject: [PATCH 023/101] add studiensemester param to incoming/outgoing/gs
 backend

---
 application/config/routes.php                 |  6 +++---
 .../api/frontend/v1/stv/Students.php          | 21 ++++++++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index da3a45f03..189400a72 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -70,9 +70,9 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv
 
 // (studiensemester_kurzbz)/inout[/(incoming|outgoing|gemeinsamestudien)]
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout'] = 'api/frontend/v1/stv/Students/index';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming/$1';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing/$1';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien/$1';
 
 // (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
 $route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 4bd449715..88a87804e 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -101,31 +101,46 @@ class Students extends FHCAPI_Controller
 	}
 
 	/**
+	 * @param string		$studiensemester_kurzbz
+	 *
 	 * @return void
 	 */
-	public function getIncoming()
+	public function getIncoming($studiensemester_kurzbz)
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		]);
 		// TODO(chris): IMPLEMENT!
 		$this->terminateWithSuccess([]);
 	}
 
 	/**
+	 * @param string		$studiensemester_kurzbz
+	 *
 	 * @return void
 	 */
-	public function getOutgoing()
+	public function getOutgoing($studiensemester_kurzbz)
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		]);
 		// TODO(chris): IMPLEMENT!
 		$this->terminateWithSuccess([]);
 	}
 
 	/**
+	 * @param string		$studiensemester_kurzbz
+	 *
 	 * @return void
 	 */
-	public function getGemeinsamestudien()
+	public function getGemeinsamestudien($studiensemester_kurzbz)
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		]);
 		// TODO(chris): IMPLEMENT!
 		$this->terminateWithSuccess([]);
 	}

From 31a5caa5580b2002c337265fdd64447a3bcc9361 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 20 Aug 2025 11:56:29 +0200
Subject: [PATCH 024/101] better (safer) output for semester verband gruppe
 prio

---
 .../api/frontend/v1/stv/Students.php          | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 88a87804e..71b7be872 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -342,9 +342,11 @@ class Students extends FHCAPI_Controller
 		$this->prepareQuery($studiensemester_kurzbz);
 		
 		$this->PrestudentModel->addSelect("
-			CASE WHEN ps.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-			THEN ps.ausbildungssemester::text 
-			ELSE ''::text END AS semester", false);
+			CASE 
+				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN ps.ausbildungssemester::text 
+				ELSE ''::text 
+			END AS semester", false);
 		$this->PrestudentModel->addSelect("'' AS verband");
 		$this->PrestudentModel->addSelect("'' AS gruppe");
 		$this->addSelectPrioRel();
@@ -549,9 +551,16 @@ class Students extends FHCAPI_Controller
 			);*/
 		$this->prepareQuery($studiensemester_kurzbz);
 
-		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN pls.ausbildungssemester::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
 
 		$this->addSelectPrioRel();
 
@@ -796,12 +805,12 @@ class Students extends FHCAPI_Controller
 			SELECT count(*)
 			FROM (
 				SELECT *, public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) AS laststatus
-				FROM PUBLIC.tbl_prestudent pss
-				JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
+				FROM public.tbl_prestudent pss
+				JOIN public.tbl_prestudentstatus USING (prestudent_id)
 				WHERE person_id = p.person_id
 				AND studiensemester_kurzbz = (
 					SELECT studiensemester_kurzbz
-					FROM PUBLIC.tbl_prestudentstatus
+					FROM public.tbl_prestudentstatus
 					WHERE prestudent_id = tbl_prestudent.prestudent_id
 					AND status_kurzbz = 'Interessent'
 					LIMIT 1
@@ -810,7 +819,7 @@ class Students extends FHCAPI_Controller
 			) prest
 			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
 			AND priorisierung <= tbl_prestudent.priorisierung
-		) || ' (' || tbl_prestudent.priorisierung || ')' AS priorisierung_relativ", false);
+		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
 	}
 
 	/**

From 923427b41f20bfde6304dba69102b7a993c08f89 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 20 Aug 2025 11:57:31 +0200
Subject: [PATCH 025/101] Implement: stv/students/getIncoming

---
 .../api/frontend/v1/stv/Students.php          | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 71b7be872..b4116ed0d 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -111,8 +111,43 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_params', [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
+		
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN pls.ausbildungssemester::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+
+		$selectIncoming = "SELECT 1 
+			FROM public.tbl_prestudentstatus test 
+			WHERE test.prestudent_id=tbl_prestudent.prestudent_id 
+			AND test.status_kurzbz='Incoming' 
+			AND test.studiensemester_kurzbz=v.studiensemester_kurzbz";
+
+		$this->PrestudentModel->db->where("EXISTS (" . $selectIncoming . ")", null, false);
+
+		$result = $this->PrestudentModel->load();
+		
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 
 	/**

From 5ba0007641ec0bd23f95a7944da07ba304a5b39c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 20 Aug 2025 14:34:19 +0200
Subject: [PATCH 026/101] fix: correct relative priority calculation

---
 application/controllers/api/frontend/v1/stv/Students.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index b4116ed0d..fe2167189 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -839,7 +839,7 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("(
 			SELECT count(*)
 			FROM (
-				SELECT *, public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) AS laststatus
+				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
 				FROM public.tbl_prestudent pss
 				JOIN public.tbl_prestudentstatus USING (prestudent_id)
 				WHERE person_id = p.person_id

From c9104749c54969682790843bd8ab3111827bd8c4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 20 Aug 2025 16:52:16 +0200
Subject: [PATCH 027/101] Faster Query for stv/students/getIncoming

---
 .../api/frontend/v1/stv/Students.php          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index fe2167189..8dcdbcc5e 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -116,6 +116,17 @@ class Students extends FHCAPI_Controller
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
 
+		$this->PrestudentModel->addJoin(
+			"(
+				SELECT prestudent_id 
+				FROM public.tbl_prestudentstatus
+				WHERE status_kurzbz = 'Incoming'
+				AND studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+			) test",
+			"prestudent_id"
+		);
+
+
 		$this->prepareQuery($studiensemester_kurzbz);
 
 		$this->PrestudentModel->addSelect("COALESCE(
@@ -134,14 +145,6 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);
 
 
-		$selectIncoming = "SELECT 1 
-			FROM public.tbl_prestudentstatus test 
-			WHERE test.prestudent_id=tbl_prestudent.prestudent_id 
-			AND test.status_kurzbz='Incoming' 
-			AND test.studiensemester_kurzbz=v.studiensemester_kurzbz";
-
-		$this->PrestudentModel->db->where("EXISTS (" . $selectIncoming . ")", null, false);
-
 		$result = $this->PrestudentModel->load();
 		
 

From 7de81fab7de9cb8472b670b25fe3b5e302d10968 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 20 Aug 2025 17:00:14 +0200
Subject: [PATCH 028/101] Implement: stv/students/getOutgoing

---
 .../api/frontend/v1/stv/Students.php          | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 8dcdbcc5e..0e4a311c9 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -164,8 +164,60 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_params', [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
+		
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
+			"(
+				SELECT prestudent_id 
+				FROM bis.tbl_bisio bis 
+				JOIN public.tbl_student USING (student_uid)
+				JOIN public.tbl_studiensemester stdsem ON (
+					(bis.von >= stdsem.start AND bis.von <= stdsem.ende) 
+					OR 
+					(bis.bis >= stdsem.start AND bis.bis <= stdsem.ende) 
+					OR 
+					(bis.von <= stdsem.start AND bis.bis >= stdsem.ende)
+				)
+				WHERE NOT EXISTS (
+					SELECT 1 
+					FROM public.tbl_prestudentstatus 
+					WHERE status_kurzbz = 'Incoming'
+					AND prestudent_id = tbl_student.prestudent_id
+				) AND stdsem.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				GROUP BY prestudent_id
+			) test",
+			"prestudent_id"
+		);
+
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN pls.ausbildungssemester::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+
+		$result = $this->PrestudentModel->load();
+		
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 
 	/**

From 608e2b5171aa236497369813226080d7b65ddf66 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 21 Aug 2025 09:18:52 +0200
Subject: [PATCH 029/101] Implement: stv/students/getGemeinsamestudien

---
 .../api/frontend/v1/stv/Students.php          | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 0e4a311c9..691e56b74 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -231,8 +231,46 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_params', [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
+		
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
+			"(
+				SELECT prestudent_id
+				FROM bis.tbl_mobilitaet 
+				WHERE studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+			) bis",
+			"prestudent_id"
+		);
+
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN pls.ausbildungssemester::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+
+		$result = $this->PrestudentModel->load();
+		
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 
 	public function getPrestudents($studiengang_kz,

From 9b8ac595c6783060354e6ae0e8bbd1e9719e54a4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 21 Aug 2025 12:59:24 +0200
Subject: [PATCH 030/101] Code Quality

---
 application/config/routes.php                 |   4 +-
 .../api/frontend/v1/stv/Students.php          | 162 ++++++------------
 2 files changed, 56 insertions(+), 110 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 189400a72..58677e8ee 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -1,6 +1,6 @@
 <?php
 
-defined('BASEPATH') OR exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------------
@@ -51,7 +51,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 |   my-controller/my-method -> my_controller/my_method
 */
 $route['default_controller'] = defined('CIS4') && CIS4 ? 'Cis4' : 'Vilesci';
-$route['translate_uri_dashes'] = FALSE;
+$route['translate_uri_dashes'] = false;
 
 // Class name conflicts
 $route['api/v1/organisation/[S|s]tudiengang/(:any)'] = 'api/v1/organisation/studiengang2/$1';
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 691e56b74..04dc7a33a 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -51,7 +51,6 @@ class Students extends FHCAPI_Controller
 				'lehre'
 			)
 		);
-
 	}
 
 	/**
@@ -75,7 +74,7 @@ class Students extends FHCAPI_Controller
 	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)					=> getPrestudentsOrgform
 	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)/(otherfilter)	=> getPrestudentsOrgform
 	 *
-	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)	=> getStudentsSpezialguppe
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)	=> getStudentsSpezialgruppe
 	 *
 	 * /(studiensemester_kurzbz)/(studiengang_kz)								=> getStudents
 	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)					=> getStudents
@@ -273,10 +272,11 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getPrestudents($studiengang_kz,
-		$studiensemester_kurzbz = null, $filter = null
-	)
-	{
+	public function getPrestudents(
+		$studiengang_kz,
+		$studiensemester_kurzbz = null,
+		$filter = null
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiengang_kz' => $studiengang_kz,
@@ -287,10 +287,12 @@ class Students extends FHCAPI_Controller
 		$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter);
 	}
 
-	public function getPrestudentsOrgform($studiengang_kz, $orgform_kurzbz,
-		$studiensemester_kurzbz = null, $filter = null
-	)
-	{
+	public function getPrestudentsOrgform(
+		$studiengang_kz,
+		$orgform_kurzbz,
+		$studiensemester_kurzbz = null,
+		$filter = null
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiengang_kz' => $studiengang_kz,
@@ -370,7 +372,7 @@ class Students extends FHCAPI_Controller
 
 				$stg = $this->getDataOrTerminateWithError($result);
 				if (!$stg)
-					$this->terminateWithValidationErrors(['' => 'Studiengang does not exist']); // TODO(chris): phrase
+					$this->terminateWithSuccess([]);
 				$stg = current($stg);
 
 				$where['ps.status_kurzbz'] = 'Interessent';
@@ -439,7 +441,10 @@ class Students extends FHCAPI_Controller
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
-					// TODO(chris): this does not work with $orgform_kurzbz != null
+					/** NOTE(chris):
+					 * show all prestudents in this stg who don't have a status
+					 * $orgform_kurzbz does not change the results since orgform is stored in the status table
+					 */
 					$where['ps.status_kurzbz'] = null;
 				} else {
 					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
@@ -453,20 +458,6 @@ class Students extends FHCAPI_Controller
 				break;
 		}
 
-		/*
-			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
-			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
-				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
-				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
-				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
-				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
-			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
-			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
-				ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
-				AND ps.prestudent_id=tbl_prestudent.prestudent_id 
-				AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
-				AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');*/
 		$this->prepareQuery($studiensemester_kurzbz);
 		
 		$this->PrestudentModel->addSelect("
@@ -488,10 +479,13 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getStudents($studiensemester_kurzbz,
-		$studiengang_kz, $semester = null, $verband = null, $gruppe = null
-	)
-	{
+	public function getStudents(
+		$studiensemester_kurzbz,
+		$studiengang_kz,
+		$semester = null,
+		$verband = null,
+		$gruppe = null
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -504,10 +498,14 @@ class Students extends FHCAPI_Controller
 		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, null);
 	}
 
-	public function getStudentsOrgform($studiensemester_kurzbz,
-		$studiengang_kz, $orgform_kurzbz, $semester = null, $verband = null, $gruppe = null
-	)
-	{
+	public function getStudentsOrgform(
+		$studiensemester_kurzbz,
+		$studiengang_kz,
+		$orgform_kurzbz,
+		$semester = null,
+		$verband = null,
+		$gruppe = null
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -521,10 +519,12 @@ class Students extends FHCAPI_Controller
 		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, $orgform_kurzbz);
 	}
 
-	public function getStudentsSpezialgruppe($studiensemester_kurzbz,
-		$studiengang_kz, $semester, $gruppe_kurzbz,
-		$orgform_kurzbz = null)
-	{
+	public function getStudentsSpezialgruppe(
+		$studiensemester_kurzbz,
+		$studiengang_kz,
+		$semester,
+		$gruppe_kurzbz
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -536,10 +536,13 @@ class Students extends FHCAPI_Controller
 		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, null);
 	}
 
-	public function getStudentsOrgformSpezialgruppe($studiensemester_kurzbz,
-		$orgform_kurzbz, $studiengang_kz, $semester, $gruppe_kurzbz
-	)
-	{
+	public function getStudentsOrgformSpezialgruppe(
+		$studiensemester_kurzbz,
+		$orgform_kurzbz,
+		$studiengang_kz,
+		$semester,
+		$gruppe_kurzbz
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -563,8 +566,15 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
-	{
+	protected function fetchStudents(
+		$studiensemester_kurzbz,
+		$studiengang_kz,
+		$semester = null,
+		$verband = null,
+		$gruppe = null,
+		$gruppe_kurzbz = null,
+		$orgform_kurzbz = null
+	) {
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
@@ -573,21 +583,6 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		/*
-			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
-			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
-				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
-				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
-				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
-				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
-			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
-			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-			$this->PrestudentModel->addJoin(
-				'public.tbl_studentlehrverband v',
-				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
-			);*/
 		$this->prepareQuery($studiensemester_kurzbz, '');
 
 		$this->PrestudentModel->addSelect('v.semester');
@@ -627,7 +622,6 @@ class Students extends FHCAPI_Controller
 					false
 				);
 			}
-
 		}
 
 		$this->addFilter($studiensemester_kurzbz);
@@ -661,22 +655,6 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		/*
-			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
-			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
-			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
-				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
-				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
-				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
-				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
-			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
-			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
-			$this->PrestudentModel->addJoin(
-				'public.tbl_studentlehrverband v',
-				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-				'LEFT'
-			);*/
 		$this->prepareQuery($studiensemester_kurzbz);
 
 		$this->PrestudentModel->addSelect("COALESCE(
@@ -725,22 +703,6 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		/*
-			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
-			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
-				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
-				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
-				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
-				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
-			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
-			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-			$this->PrestudentModel->addJoin(
-				'public.tbl_studentlehrverband v',
-				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-				'LEFT'
-			);*/
 		$this->prepareQuery($studiensemester_kurzbz);
 
 		$this->PrestudentModel->addSelect('v.semester');
@@ -785,15 +747,6 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		/*
-			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-			$this->PrestudentModel->addJoin(
-				'public.tbl_studentlehrverband v',
-				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-				'LEFT'
-			);*/
 		$this->prepareQuery($studiensemester_kurzbz);
 
 		$this->PrestudentModel->addSelect('v.semester');
@@ -911,13 +864,6 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('mentor');
 		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
 
-		/*$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');*/
-
 		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
 
 		$this->PrestudentModel->addOrder('nachname');

From 3a5c4444cbce8262db135dbc6316d96b488f7e84 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 27 Aug 2025 14:11:03 +0200
Subject: [PATCH 031/101] Tab Archive: Documentdropdown for Printing

- define structure for single print array
- fill array with documents according to Fas Dropdown Drucken
- event for adding documents from extension/addons
---
 .../api/frontend/v1/stv/Archiv.php            |   2 +-
 .../api/frontend/v1/stv/Dokumente.php         | 506 ++++++++++++++++++
 public/js/api/factory/stv/archiv.js           |   2 +-
 public/js/api/factory/stv/documents.js        |  14 +
 .../Abschlusspruefung/Abschlusspruefung.js    |   1 -
 .../Stv/Studentenverwaltung/Details/Archiv.js |  99 +++-
 .../Details/Archiv/DocumentDropdown.js        | 116 ++++
 system/phrasesupdate.php                      |  22 +
 8 files changed, 754 insertions(+), 8 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js

diff --git a/application/controllers/api/frontend/v1/stv/Archiv.php b/application/controllers/api/frontend/v1/stv/Archiv.php
index cc636951d..09cefc045 100644
--- a/application/controllers/api/frontend/v1/stv/Archiv.php
+++ b/application/controllers/api/frontend/v1/stv/Archiv.php
@@ -39,7 +39,7 @@ class Archiv extends FHCAPI_Controller
 			'archive' => ['admin:w', 'assistenz:w'],
 			'download' => ['admin:w', 'assistenz:w'],
 			'update' => ['admin:w'],
-			'delete' => ['admin:w', 'assistenz:w']
+			'delete' => ['admin:w', 'assistenz:w'],
 		]);
 
 		// Load models
diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 18c976eb6..520f5d824 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -2,6 +2,7 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \CI3_Events as Events;
 use \DateTime as DateTime;
 
 class Dokumente extends FHCAPI_Controller
@@ -19,6 +20,8 @@ class Dokumente extends FHCAPI_Controller
 			'getDoktypen' => ['admin:r', 'assistenz:r'],
 			'uploadDokument' => ['admin:rw', 'assistenz:rw'],
 			'download' => ['admin:rw', 'assistenz:rw'],
+			'getDocumentDropDown' => ['admin:rw', 'assistenz:rw'],
+			'getDocumentDropDownMulti' => ['admin:rw', 'assistenz:rw'],
 		]);
 
 		// Load Libraries
@@ -566,4 +569,507 @@ class Dokumente extends FHCAPI_Controller
 			return false;
 		}
 	}
+
+	public function getDocumentDropDown($prestudent_id, $studiensemester_kurzbz, $studiengang_kz)
+	{
+		//TODO(Manu) Berechtigungen hasPermissionOutputformat
+		//TODO(Manu) remove: just for test ouput
+		$hasPermissionOutputformat = false;
+
+		//TODO(Manu) Validierungen
+		if (!$prestudent_id) {
+			$this->terminateWithError('Prestudent id is required.');
+		}
+		if (!$studiensemester_kurzbz)
+			$this->terminateWithError("kein Studiensemester");
+		if (!$studiengang_kz)
+			$this->terminateWithError("kein Studiengang_kz");
+
+		$uid = $this->_loadUIDFromPrestudent($prestudent_id);
+		$semArray = $this->_getEntriesStudiensemester();
+		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
+
+		//TODO(Manu) check if if Array[0] bis Array[4] befüllt
+		//TODO(Manu) handling stgTyp ungleich b,m,d
+
+		//	$semString = implode(";", $semArray);
+		//	$this->terminateWithError("Semester " . $semString . " " . $semArray[0] . " " . $semArray[1]);
+
+		$documents = [
+			$this->buildDropdownEntry("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null),
+			$this->buildDropdownEntry("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uid, 20, null),
+			$this->buildDropdownEntry("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uid, 21, null),
+			$this->buildDropdownEntry("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uid, 40, null),
+			$this->buildDropdownEntry("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uid, 41, null),
+			$this->buildDropdownEntry("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uid", $uid,100, "zutrittskarte.php"),
+			$this->buildDropdownEntry("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uid, 60, null),
+			$this->buildDropdownEntry("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uid, 61, null),
+
+			// Studienerfolg Menüs automatisch
+			$this->buildStudienerfolgSubmenu("de", $uid, $semArray, $studiensemester_kurzbz),
+			$this->buildStudienerfolgSubmenu("en", $uid, $semArray, $studiensemester_kurzbz),
+			$this->buildStudienerfolgSubmenu("de", $uid, $semArray, $studiensemester_kurzbz, true),
+			$this->buildStudienerfolgSubmenu("en", $uid, $semArray, $studiensemester_kurzbz, true),
+
+			[
+				"id" => "submenu_studstatus",
+				"type" => "submenu",
+				"name" => "Verwaltung des StudierendenStatus",
+				"order" => 110,
+				"data" => [
+					$this->buildDropdownEntry("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldungl&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					$this->buildDropdownEntry("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					$this->buildDropdownEntry("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					$this->buildDropdownEntry("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+				]
+			],
+
+			$this->loadDropDownEntriesFinalExam($hasPermissionOutputformat, $stgTyp, $uid),
+
+			$this->buildDropdownEntry("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 80, null),
+			$this->buildDropdownEntry("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 81, null)
+		];
+
+		Events::trigger('DocumentGenerationDropDown',
+			// passing $menu per reference
+			function & () use (&$documents) {
+				return $documents;
+			},
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$studiengang_kz
+		);
+
+		usort($documents, function ($a, $b) {
+			$orderA = isset($a['order']) ? (int)$a['order'] : PHP_INT_MAX;
+			$orderB = isset($b['order']) ? (int)$b['order'] : PHP_INT_MAX;
+			return $orderA <=> $orderB;
+		});
+
+
+		$this->terminateWithSuccess($documents);
+		return $documents || null;
+	}
+
+	public function getDocumentDropDownMulti()
+	{
+		$studentUids = $this->input->get('studentUids');
+		$prestudentIds = [];
+
+		if (is_array($studentUids) && !empty($studentUids)) {
+			foreach ($studentUids as $uid) {
+				$prestudent_id = $this-> _loadPrestudentFromUid($uid);
+				$prestudentIds[] = $prestudent_id;
+			}
+		} else {
+			echo "No prestudent IDs received.";
+		}
+
+		$uidString = implode(";", $studentUids);
+		$prestudentIdsString = implode(";", $prestudentIds);
+
+
+		$documents = [
+			[
+				"id"   => "accountinfo1",
+				"type" => "documenturl",
+				"name" => "Accountinfoblatt",
+				"url"  => "pdfExport.php?xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf&uid=" . $uidString,
+				"scope" => "prestudent"
+			],
+			[
+				"id"   => "ausbildungsvertrag1_de",
+				"type" => "documenturl",
+				"name" => "Ausbildungsvertrag Deutsch",
+				"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf&uid=" . $uidString,
+				"scope" => "prestudent"
+			],
+			[
+				"id"   => "ausbildungsvertrag1_en",
+				"type" => "documenturl",
+				"name" => "Ausbildungsvertrag Englisch",
+				"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
+				"scope" => "prestudent"
+			],
+			[
+				"id"   => "submenu_studienerfolg_1",
+				"type" => "submenu",
+				"name" => "Studienerfolg",
+				"data" => [
+					[
+						"id"   => "submenu_studienerfolg_sem1",
+						"type" => "submenu",
+						"name" => "Studienerfolg WS2025",
+						"data" => [
+							[
+								"id"   => "studienerfolg_sem_alle_1",
+								"type" => "submenu",
+								"name" => "Studienerfolg WS2025 Alle",
+								"data"  => [
+									[
+										"id"   => "studienerfolg_sem_alle_1_FA",
+										"type" => "documenturl",
+										"name" => "Studienerfolg Alle FINANZAMT",
+										"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
+										"scope" => "prestudent"
+									],
+									[
+										"id"   => "studienerfolg_sem_alle_1_nichtFA",
+										"type" => "documenturl",
+										"name" => "Studienerfolg Alle NICHT FINANZAMT",
+										"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
+										"scope" => "prestudent"
+									]
+								]
+
+							]
+						]
+					]
+				]
+			],
+			[
+				"id"   => "submenu_studstatus",
+				"type" => "submenu",
+				"name" => "Verwaltung des StudierendenStatus",
+				"data" => [
+					[
+						"id"   => "Abmeldung",
+						"type" => "documenturl",
+						"name" => "Abmeldung",
+						"url"  => "pdfExport.php?xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&output=pdf&uid=" . $uidString,
+						"scope" => "prestudent"
+					],
+					[
+						"id"   => "Abmeldung durch Stg",
+						"type" => "documenturl",
+						"name" => "AntragAbmeldungStgl",
+						"url"  => "pdfExport.php?xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&output=pdf&uid=" . $uidString,
+						"scope" => "prestudent"
+					]
+				]
+			],
+			[
+				"id"   => "zutrittskarte",
+				"type" => "documenturl",
+				"name" => "Zutrittskarte",
+				"url"  => "zutrittskarte.php?xsl=ZutrittskarteStud&output=pdf&data=" . $uidString,
+				"scope" => "prestudent"
+			],
+			[
+				"id"   => "zutrittskarte",
+				"type" => "parameterurl",
+				"name" => "Zutrittskarte",
+				"baseurl" => "zutrittskarte.php",
+ 				"parameterurl" =>"xsl=ZutrittskarteStud&output=pdf&data=" . $uidString,
+				"scope" => "prestudent"
+			],
+			[
+				"id"   => "studienbestaetigung",
+				"type" => "documenturl",
+				"name" => "Studienbestätigung",
+				"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
+				"scope" => "prestudent"
+			],
+			[
+				"id"   => "studienerfolg",
+				"type" => "documenturl",
+				"name" => "Studienbestätigung",
+				"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
+				"scope" => "prestudent"
+			],
+
+		];
+
+/*		Events::trigger('DocumentGenerationDropDownMulti',
+			// passing $menu per reference
+			function & () use (&$documents) {
+				return $documents;
+			},
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$studiengang_kz
+		);*/
+
+		usort($documents, function ($a, $b) {
+			$orderA = isset($a['order']) ? (int)$a['order'] : PHP_INT_MAX;
+			$orderB = isset($b['order']) ? (int)$b['order'] : PHP_INT_MAX;
+			return $orderA <=> $orderB;
+		});
+
+	//	FireEvent(DocumentGenerationDropDownMulti(&$documents);
+
+		$this->terminateWithSuccess($documents);
+
+		return $documents || null;
+	}
+
+	private function _loadUIDFromPrestudent($prestudent_id)
+	{
+		if(!$prestudent_id){
+			return $this->terminateWithError("no prestudent ID received.");
+		}
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->loadWhere(
+			['prestudent_id' => $prestudent_id]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$student = current($data);
+
+		return $student->student_uid;
+	}
+
+	private function _loadPrestudentFromUid($studentUid)
+	{
+
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->loadWhere(
+			['student_uid' => $studentUid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$student = current($data);
+
+
+		return $student->prestudent_id;
+	}
+
+	/**
+	 * is building an array with studiensemesterkurzb
+	 * actual studiensemester plus the 5 studiensemester in the past
+
+	 * @return Array Studiensemester_kurzbz
+	 */
+	private function _getEntriesStudiensemester(){
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addPlusMinus(1, 5);
+		$this->StudiensemesterModel->addOrder('ende', 'DESC');
+		$result = $this->StudiensemesterModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+
+		foreach($data as $sem)
+		{
+			$semArray[] = $sem->studiensemester_kurzbz;
+		}
+
+		array_shift($semArray);
+
+		return $semArray;
+	}
+	/**
+	 * is returning the typ of Studiengang (Bakk oder Master)
+
+	 * @return character  eg. 'b' or 'm'
+	 */
+	private function _getStudiengangstyp($studiengang_kz)
+	{
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$result = $this->StudiengangModel->loadWhere(
+			array('studiengang_kz' => $studiengang_kz)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$typStudiengang = current($data)->typ;
+
+		return $typStudiengang;
+	}
+
+	//TODO(Manu) make helperfunction
+	/**
+	 * is building an array for Dropdown Entry in Print Dropdown
+	 * @param $id id for the Document to add to the Document Array
+	 * @param $name name of the dropdownEntry
+	 * @param $parameterUrl url of parameters xml, xsl,format as needed
+	 * 	WITHOUT BASEURL eg. "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf"
+	 * @param $uid default parameter, if null only parameterurl will be added
+	 * 	additional needed parameter: put in the parameterUrl
+	 * @param $alternativeBaseUrl: if baseUrl not pdfExport.php, put here alternative without ? char, eg. "zutrittskarte.php"
+
+	 * @return Array
+	 */
+	private function buildDropdownEntry($id, $name, $parameterurl, $uid=null, $order=null, $alternativeBaseUrl=null)
+	{
+		//DEFAULT BASEURL
+		$baseurl = "pdfExport.php?";
+
+		$uidString = $uid ? "&uid=" . $uid : "";
+
+		if($alternativeBaseUrl)
+		{
+			return [
+				"id"    => $id,
+				"type"  => "documenturl",
+				"name"  => $name,
+				"url"   => $alternativeBaseUrl . "?" . $parameterurl . $uidString,
+				"order" => $order
+			];
+		}
+		else
+			return [
+				"id"    => $id,
+				"type"  => "documenturl",
+				"name"  => $name,
+				"url"   => $baseurl . $parameterurl . "&uid=" . $uid,
+				"order" => $order
+			];
+
+	}
+
+	/**
+	 * helper function to create ArrayStructure
+	 * actual studiensemester plus the 5 studiensemester in the past
+
+	 * @return Array Studiensemester_kurzbz
+	 */
+	private function buildStudienerfolgSubmenu($lang, $uid, $semArray, $studiensemester_kurzbz, $fa = false)
+	{
+		$entries = [];
+
+		$xsl = $lang === "de" ? "Studienerfolg" : "StudienerfolgEng";
+		$idPrefix = "submenu_studienerfolg_" . $lang . ($fa ? "_fa" : "");
+
+		$entries[] = $this->buildDropdownEntry(
+			$idPrefix . "_aktuell",
+			"ausgewähltes Semester",
+			"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$studiensemester_kurzbz" . ($fa ? "&typ=finanzamt" : ""),
+			$uid
+		);
+
+		//all semester
+		$entries[] = $this->buildDropdownEntry(
+			$idPrefix . "_all",
+			"alle Semester",
+			"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$studiensemester_kurzbz&all=true" . ($fa ? "&typ=finanzamt" : ""),
+			$uid
+		);
+
+		//sem from array
+		foreach ($semArray as $i => $sem) {
+			$entries[] = $this->buildDropdownEntry(
+				$idPrefix . ($i === 0 ? "_akt" : "_minus" . $i),
+				$sem,
+				"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$sem" . ($fa ? "&typ=finanzamt" : ""),
+				$uid
+			);
+
+		}
+		$order = 0;
+		if ($lang === "de" && !$fa) $order = 75; // Studienerfolg
+		if ($lang === "en" && !$fa) $order = 76; // Studienerfolg Englisch
+		if ($lang === "de" &&  $fa) $order = 77; // Studienerfolg Finanzamt
+		if ($lang === "en" &&  $fa) $order = 78; // Studienerfolg Finanzamt Englisch
+
+		return [
+			"id"   => $idPrefix,
+			"type" => "submenu",
+			"name" => "Studienerfolg " . ($fa ? " Finanzamt" : "") . ($lang === "de" ? "" : "Englisch") ,
+			"order" => $order,
+			"data" => $entries,
+		];
+	}
+
+	private function loadDropDownEntriesFinalExam($hasPermissionOutputformat, $stgTyp, $uid)
+	{
+		if ($stgTyp == 'b')
+			$postfix = 'Bakk';
+		else if ($stgTyp == 'm' || $stgTyp == 'd')
+			$postfix = 'Master';
+		else
+			//TODO(Manu) sollte nicht null sein!! -> dropdown wird  im Falle von Lehrgängen nicht erstellt
+			return null;
+
+
+		$arrayFinalExam = [
+			'pruefungsprotokoll' => [
+				'de' => [
+					'Bakk' => 'PrProtBA',
+					'Master' => 'PrProtMA',
+				],
+				'en' => [
+					'Bakk' => 'PrProtBAEng',
+					'Master' => 'PrProtMAEng',
+				],
+			],
+			'pruefungszeugnis' => [
+				'de' => [
+					'Bakk' => 'Bakkzeugnis',
+					'Master' => 'Diplomzeugnis',
+				],
+				'en' => [
+					'Bakk' => 'BakkzeugnisEng',
+					'Master' => 'DiplomzeugnisEng',
+				],
+			],
+			'urkunde' => [
+				'de' => [
+					'Bakk' => 'Bakkurkunde',
+					'Master' => 'Diplomurkunde',
+				],
+				'en' => [
+					'Bakk' => 'BakkurkundeEng',
+					'Master' => 'DiplomurkundeEng',
+				],
+			],
+		];
+
+		$langLabels = [
+			"de" => "Deutsch",
+			"en" => "Englisch"
+		];
+
+		$docLabels = [
+			"pruefungsprotokoll" => "Prüfungsprotokoll",
+			"pruefungszeugnis" => "Zeugnis",
+			"urkunde" => "Urkunde"
+		];
+
+		$submenuData = [];
+		if ($hasPermissionOutputformat) {
+			foreach ($arrayFinalExam as $docType => $langs) {
+				foreach ($langs as $lang => $types) {
+					$xsl = $types[$postfix];
+					$idPrefix = $docType . "_" . $lang;
+
+					$baseName = $docLabels[$docType] . " " . $langLabels[$lang];
+					$baseUrl = "xml=abschlusspruefung.rdf.php&xsl={$xsl}";
+
+					//3 outputformates
+					foreach (["pdf", "odt", "docx"] as $format) {
+						$submenuData[] = $this->buildDropdownEntry(
+							$idPrefix . "_" . $format,
+							$baseName . " (" . strtoupper($format) . ")",
+							$baseUrl . "&output=" . $format,
+							$uid
+						);
+					}
+				}
+			}
+		}
+		else
+		{
+			foreach ($arrayFinalExam as $docType => $langs) {
+				foreach ($langs as $lang => $types) {
+					$xsl = $types[$postfix]; // Auswahl Bakk/Master für jeweilige Sprache
+					$id = $docType . "_" . $lang;
+
+					$name = $docLabels[$docType] . " " . $langLabels[$lang];
+
+					$url = "xml=abschlusspruefung.rdf.php&xsl=" . $xsl . "&output=pdf";
+
+					$submenuData[] = $this->buildDropdownEntry($id, $name, $url, $uid);
+				}
+			}
+		}
+		return [
+			"id" => "submenu_finalexam",
+			"type" => "submenu",
+			"name" => "Abschlussprüfung",
+			"data" => $submenuData,
+			"order" => null,
+			"order" => 80,
+		];
+	}
+
 }
diff --git a/public/js/api/factory/stv/archiv.js b/public/js/api/factory/stv/archiv.js
index ca8f25116..cf380b25d 100644
--- a/public/js/api/factory/stv/archiv.js
+++ b/public/js/api/factory/stv/archiv.js
@@ -39,5 +39,5 @@ export default {
 			url: 'api/frontend/v1/stv/archiv/delete',
 			params: {akte_id, studiengang_kz}
 		};
-	}
+	},
 };
diff --git a/public/js/api/factory/stv/documents.js b/public/js/api/factory/stv/documents.js
index 1898023cd..37ec8298b 100644
--- a/public/js/api/factory/stv/documents.js
+++ b/public/js/api/factory/stv/documents.js
@@ -73,4 +73,18 @@ export default {
 			params
 		};
 	},
+	getDocumentDropdown(params){
+	console.log(params);
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/getDocumentDropDown/' + params.prestudent_id + '/' + params.studiensemester_kurzbz + '/' + params.studiengang_kz,
+		};
+	},
+	getDocumentDropdownMulti(studentUids){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/getDocumentDropDownMulti/',
+			params: {studentUids}
+		};
+	}
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index e5c4cade1..5bcb75176 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -7,7 +7,6 @@ import AbschlusspruefungDropdown from "./AbschlusspruefungDropdown.js";
 
 import ApiStudiengang from '../../../../../api/factory/studiengang.js';
 import ApiStvAbschlusspruefung from '../../../../../api/factory/stv/abschlusspruefung.js';
-import ApiStvAddress from "../../../../../api/factory/stv/kontakt/address.js";
 
 export default {
 	components: {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 7a156965f..f439d0135 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -3,18 +3,29 @@ import FormInput from "../../../Form/Input.js";
 import AkteEdit from "./Archiv/Edit.js";
 
 import ApiStvArchiv from '../../../../api/factory/stv/archiv.js';
+import ApiStvDocuments from '../../../../api/factory/stv/documents.js';
+import DocumentDropdown from "../Details/Archiv/DocumentDropdown";
+
 
 export default {
 	name: 'Archiv',
 	components: {
 		CoreFilterCmpt,
 		FormInput,
-		AkteEdit
+		AkteEdit,
+		DocumentDropdown
 	},
 	inject: {
 		currentSemester: {
 			from: 'currentSemester'
-		}
+		},
+		/* isBerechtigtDocAndOdt: {
+			from: 'hasPermissionOutputformat',
+			default: false
+		},*/
+		cisRoot: {
+			from: 'cisRoot'
+		},
 	},
 	props: {
 		modelValue: Object,
@@ -64,7 +75,8 @@ export default {
 				'abschlussdokument_lehrgaenge.xml.php': [
 						'AbschlussdokumentLehrgaenge'
 				]
-			}
+			},
+			documentDropdownObject: {}
 		};
 	},
 	computed: {
@@ -184,7 +196,42 @@ export default {
 			];
 
 			return events;
+		},
+		studentUids() {
+			if (this.modelValue.uid)
+			{
+				return [this.modelValue.uid];
+			}
+			return this.modelValue.map(e => e.uid);
+		},
+		studentKzs(){
+			if (this.modelValue.uid)
+			{
+				return [this.modelValue.studiengang_kz];
+			}
+			return this.modelValue.map(e => e.studiengang_kz);
+		},
+		stg_kz(){
+			return this.studentKzs[0];
+		},
+		showAllFormats() {
+			if( this.isBerechtigtDocAndOdt === false
+				|| !Array.isArray(this.isBerechtigtDocAndOdt) )
+			{
+				return false;
+			}
+			let retval = this.isBerechtigtDocAndOdt.includes(this.stgInfo.oe_kurzbz);
+			return retval;
+		},
+		showDropDownMulti(){
+
+			if (this.modelValue.length) {
+				console.log("started comp property showDropdown Multi " + this.modelValue.length);
+				return true;
+			}
+			return false;
 		}
+
 	},
 	watch: {
 		modelValue() {
@@ -252,14 +299,44 @@ export default {
 		}
 	},
 	created() {
+		this.$api
+			.call(ApiStvArchiv.getArchivVorlagen())
+			.then(result => {
+				this.vorlagenArchiv = result.data;
+				this.selectedVorlage = result.data.filter(o => o.vorlage_kurzbz == 'Zeugnis')[0];
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		if (this.modelValue.length) {
+			console.log("multi" + this.modelValue.length);
+			console.log(this.studentUids);
 			this.$api
-				.call(ApiStvArchiv.getArchivVorlagen())
-				.then(result => {this.vorlagenArchiv = result.data; this.selectedVorlage = result.data.filter(o => o.vorlage_kurzbz == 'Zeugnis')[0];})
+				.call(ApiStvDocuments.getDocumentDropdownMulti(this.studentUids))
+				.then(result => {
+					console.log(result);
+					this.documentDropdownObject = result;
+				})
 				.catch(this.$fhcAlert.handleSystemError);
+		} else {
+			console.log("single");
+			const params = {
+				prestudent_id: this.modelValue.prestudent_id,
+				studiensemester_kurzbz: this.currentSemester,
+				studiengang_kz: this.modelValue.studiengang_kz
+			};
+			this.$api
+				.call(ApiStvDocuments.getDocumentDropdown(params))
+				.then(result => {
+					console.log(result);
+					this.documentDropdownObject = result;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 
 	},
 	template: `
 	<div class="stv-details-archiv h-100 d-flex flex-column">
+
 		<core-filter-cmpt
 			ref="table"
 			table-only
@@ -270,6 +347,7 @@ export default {
 			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			>
 			<template #actions>
+
 				<div class="input-group w-auto">
 					<select class="form-select" v-model="selectedVorlage">
 						<option v-for="vorlage in vorlagenArchiv" :key="vorlage.vorlage_kurzbz" :value="vorlage">
@@ -285,6 +363,17 @@ export default {
 						{{ $p.t('stv/archiv_dokument_archivieren') }}
 					</button>
 				</div>
+
+				<document-dropdown
+					v-if="documentDropdownObject.data"
+					:documents="documentDropdownObject.data"
+					:showAllFormats='true'
+					:studentUids="studentUids"
+					:showDropDownMulti="showDropDownMulti"
+					:cisRoot="cisRoot"
+					:stgKz="stg_kz"
+				></document-dropdown>
+
 			</template>
 		</core-filter-cmpt>
 		<akte-edit ref="edit" :config="config" @saved="updateData"></akte-edit>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
new file mode 100644
index 000000000..215a1f1ca
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
@@ -0,0 +1,116 @@
+export default {
+	name: "DocumentDropdown",
+	props: {
+		documents: {
+			type: [Object, Array],
+			required: true,
+		},
+		studentUids: {
+			type: [Array, String],
+			required: true,
+			default: () => []
+		},
+		showDropDownMulti: {
+			type: Boolean,
+			required: true
+		},
+		cisRoot: {
+			type: String,
+			required: true
+		},
+		stgKz: {
+			type: Number,
+			required: true
+		},
+		showAllFormats: {
+			type: Boolean,
+			required: true
+		}
+	},
+	data() {
+		return {};
+	},
+	methods: {
+		printDokument(url, scope){
+			//TODO Manu(check if logic not in content (Zutrittkarte also in content folder))
+			let linkToPdf = this.cisRoot + 'content/' + url;
+			console.log("in print " + linkToPdf + " scope" + scope);
+			window.open(linkToPdf, '_blank');
+		}
+	},
+	template: `
+	<div class="stv-document-dropdown">
+		<div class="btn-group">
+			<button
+				v-if="!showDropDownMulti"
+				ref="toolbarButton"
+				type="button"
+				class="btn btn-secondary dropdown-toggle"
+				data-bs-toggle="dropdown"
+				data-bs-auto-close="outside"
+				aria-expanded="false"
+				@[\`show.bs.dropdown\`]="event => { if (event.target.closest('.tabulator-row')) event.target.closest('.tabulator-row').style.zIndex = 12 }"
+				@[\`hidden.bs.dropdown\`]="event => { if (event.target.closest('.tabulator-row')) event.target.closest('.tabulator-row').style.zIndex = '' }"
+				>
+				{{this.$p.t('dokumente','dokument_erstellen')}}
+			</button>
+			<button
+				v-else
+				ref="toolbarButton"
+				type="button"
+				class="btn btn-secondary dropdown-toggle"
+				data-bs-toggle="dropdown"
+				data-bs-auto-close="outside"
+				aria-expanded="false"
+				>
+				multi: {{this.$p.t('tools','dokument_erstellen')}}
+			</button>
+
+		  <ul class="dropdown-menu dropdown-menu-right">
+			<template v-for="doc in documents" :key="doc.id">
+				<li v-if="doc.type === 'documenturl'">
+				  <button class="dropdown-item" type="button" @click="printDokument(doc.url, doc.scope)">
+				  {{ doc.name }}
+				  </button>
+				</li>
+
+				<li v-else-if="doc.type === 'submenu'" class="dropend">
+				  <a
+				  class="dropdown-item dropdown-toggle"
+				  href="#"
+				  role="button"
+				  data-bs-toggle="dropdown"
+				  aria-expanded="false"
+				  >
+				  {{ doc.name }}
+				  </a>
+
+				  <ul class="dropdown-menu">
+					  <template v-for="child in doc.data" :key="child.id">
+						<li v-if="child.type === 'documenturl'">
+						<button class="dropdown-item" type="button" @click="printDokument(child.url, child.scope)">
+						  {{ child.name }}
+						</button>
+						</li>
+						<li v-else-if="child.type === 'submenu'" class="dropend">
+						<a
+						  class="dropdown-item dropdown-toggle"
+						  href="#"
+						  role="button"
+						  data-bs-toggle="dropdown"
+						  aria-expanded="false"
+						>
+						  {{ child.name }}
+						</a>
+						</li>
+					  </template>
+				  </ul>
+				</li>
+			</template>
+		  </ul>
+
+	</div>
+</div>`
+};
+
+
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 23eb39a21..fa03c4ba5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -47543,6 +47543,28 @@ and represent the current state of research on the topic. The prescribed citatio
 		)
 	),
 	//****************************	 CORE/search end
+	// ###  	DOKUMENTE ERSTELLEN PHRASEN 		START 		###
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'dokument_erstellen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument erstellen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create Document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// ### 		DOKUMENTE ERSTELLEN PHRASEN 		END 		###
 );
 
 

From 7b187ebadd42c3ad3f39821031a15df93deb046f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 28 Aug 2025 11:05:04 +0200
Subject: [PATCH 032/101] add Dropdown for Multiaction Print add Event for
 adding Documents to PrintArray add Berechtigung hasPermissionOutputformat to
 enable Print for odt and doc Formats (documents abschlusspruefung) add
 Validations

---
 .../api/frontend/v1/stv/Dokumente.php         | 184 ++++++------------
 public/js/api/factory/stv/documents.js        |   5 +-
 .../Stv/Studentenverwaltung/Details/Archiv.js |  12 +-
 .../Details/Archiv/DocumentDropdown.js        |  95 ++++-----
 4 files changed, 103 insertions(+), 193 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 520f5d824..17be3b9df 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -572,29 +572,21 @@ class Dokumente extends FHCAPI_Controller
 
 	public function getDocumentDropDown($prestudent_id, $studiensemester_kurzbz, $studiengang_kz)
 	{
-		//TODO(Manu) Berechtigungen hasPermissionOutputformat
-		//TODO(Manu) remove: just for test ouput
-		$hasPermissionOutputformat = false;
+		//permission to create also odt, and doc outputs of certain documents(menu abschlusspruefung)
+		$hasPermissionOutputformat = $this->permissionlib->isBerechtigt('system/change_outputformat', 's');
 
-		//TODO(Manu) Validierungen
-		if (!$prestudent_id) {
-			$this->terminateWithError('Prestudent id is required.');
-		}
+		if (!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Prestudent_id']), self::ERROR_TYPE_GENERAL);
 		if (!$studiensemester_kurzbz)
-			$this->terminateWithError("kein Studiensemester");
-		if (!$studiengang_kz)
-			$this->terminateWithError("kein Studiengang_kz");
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiensemester']), self::ERROR_TYPE_GENERAL);
+		if(!$studiengang_kz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+
 
 		$uid = $this->_loadUIDFromPrestudent($prestudent_id);
 		$semArray = $this->_getEntriesStudiensemester();
 		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
 
-		//TODO(Manu) check if if Array[0] bis Array[4] befüllt
-		//TODO(Manu) handling stgTyp ungleich b,m,d
-
-		//	$semString = implode(";", $semArray);
-		//	$this->terminateWithError("Semester " . $semString . " " . $semArray[0] . " " . $semArray[1]);
-
 		$documents = [
 			$this->buildDropdownEntry("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null),
 			$this->buildDropdownEntry("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uid, 20, null),
@@ -605,7 +597,6 @@ class Dokumente extends FHCAPI_Controller
 			$this->buildDropdownEntry("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uid, 60, null),
 			$this->buildDropdownEntry("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uid, 61, null),
 
-			// Studienerfolg Menüs automatisch
 			$this->buildStudienerfolgSubmenu("de", $uid, $semArray, $studiensemester_kurzbz),
 			$this->buildStudienerfolgSubmenu("en", $uid, $semArray, $studiensemester_kurzbz),
 			$this->buildStudienerfolgSubmenu("de", $uid, $semArray, $studiensemester_kurzbz, true),
@@ -617,7 +608,7 @@ class Dokumente extends FHCAPI_Controller
 				"name" => "Verwaltung des StudierendenStatus",
 				"order" => 110,
 				"data" => [
-					$this->buildDropdownEntry("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldungl&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					$this->buildDropdownEntry("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
 					$this->buildDropdownEntry("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
 					$this->buildDropdownEntry("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
 					$this->buildDropdownEntry("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
@@ -651,8 +642,11 @@ class Dokumente extends FHCAPI_Controller
 		return $documents || null;
 	}
 
-	public function getDocumentDropDownMulti()
+	public function getDocumentDropDownMulti($studiensemester_kurzbz,$studiengang_kz)
 	{
+		//permission to create also odt, and doc outputs of certain documents (menu abschlusspruefung)
+		$hasPermissionOutputformat = $this->permissionlib->isBerechtigt('system/change_outputformat', 's');
+
 		$studentUids = $this->input->get('studentUids');
 		$prestudentIds = [];
 
@@ -661,134 +655,71 @@ class Dokumente extends FHCAPI_Controller
 				$prestudent_id = $this-> _loadPrestudentFromUid($uid);
 				$prestudentIds[] = $prestudent_id;
 			}
-		} else {
-			echo "No prestudent IDs received.";
 		}
+		else
+		{
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Array StudentUIDs']), self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!$studiensemester_kurzbz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiensemester']), self::ERROR_TYPE_GENERAL);
+		if(!$studiengang_kz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+
 
 		$uidString = implode(";", $studentUids);
 		$prestudentIdsString = implode(";", $prestudentIds);
 
+		$semArray = $this->_getEntriesStudiensemester();
+		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
 
 		$documents = [
-			[
-				"id"   => "accountinfo1",
-				"type" => "documenturl",
-				"name" => "Accountinfoblatt",
-				"url"  => "pdfExport.php?xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf&uid=" . $uidString,
-				"scope" => "prestudent"
-			],
-			[
-				"id"   => "ausbildungsvertrag1_de",
-				"type" => "documenturl",
-				"name" => "Ausbildungsvertrag Deutsch",
-				"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf&uid=" . $uidString,
-				"scope" => "prestudent"
-			],
-			[
-				"id"   => "ausbildungsvertrag1_en",
-				"type" => "documenturl",
-				"name" => "Ausbildungsvertrag Englisch",
-				"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
-				"scope" => "prestudent"
-			],
-			[
-				"id"   => "submenu_studienerfolg_1",
-				"type" => "submenu",
-				"name" => "Studienerfolg",
-				"data" => [
-					[
-						"id"   => "submenu_studienerfolg_sem1",
-						"type" => "submenu",
-						"name" => "Studienerfolg WS2025",
-						"data" => [
-							[
-								"id"   => "studienerfolg_sem_alle_1",
-								"type" => "submenu",
-								"name" => "Studienerfolg WS2025 Alle",
-								"data"  => [
-									[
-										"id"   => "studienerfolg_sem_alle_1_FA",
-										"type" => "documenturl",
-										"name" => "Studienerfolg Alle FINANZAMT",
-										"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
-										"scope" => "prestudent"
-									],
-									[
-										"id"   => "studienerfolg_sem_alle_1_nichtFA",
-										"type" => "documenturl",
-										"name" => "Studienerfolg Alle NICHT FINANZAMT",
-										"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
-										"scope" => "prestudent"
-									]
-								]
+			$this->buildDropdownEntry("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uidString, 10, null),
+			$this->buildDropdownEntry("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uidString, 20, null),
+			$this->buildDropdownEntry("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uidString, 21, null),
+			$this->buildDropdownEntry("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uidString, 40, null),
+			$this->buildDropdownEntry("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uidString, 41, null),
+			$this->buildDropdownEntry("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uidString", $uidString,100, "zutrittskarte.php"),
+			$this->buildDropdownEntry("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uidString, 60, null),
+			$this->buildDropdownEntry("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uidString, 61, null),
+
+			// Studienerfolg Menüs automatisch
+			$this->buildStudienerfolgSubmenu("de", $uidString, $semArray, $studiensemester_kurzbz),
+			$this->buildStudienerfolgSubmenu("en", $uidString, $semArray, $studiensemester_kurzbz),
+			$this->buildStudienerfolgSubmenu("de", $uidString, $semArray, $studiensemester_kurzbz, true),
+			$this->buildStudienerfolgSubmenu("en", $uidString, $semArray, $studiensemester_kurzbz, true),
 
-							]
-						]
-					]
-				]
-			],
 			[
-				"id"   => "submenu_studstatus",
+				"id" => "submenu_studstatus",
 				"type" => "submenu",
 				"name" => "Verwaltung des StudierendenStatus",
+				"order" => 110,
 				"data" => [
-					[
-						"id"   => "Abmeldung",
-						"type" => "documenturl",
-						"name" => "Abmeldung",
-						"url"  => "pdfExport.php?xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&output=pdf&uid=" . $uidString,
-						"scope" => "prestudent"
-					],
-					[
-						"id"   => "Abmeldung durch Stg",
-						"type" => "documenturl",
-						"name" => "AntragAbmeldungStgl",
-						"url"  => "pdfExport.php?xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&output=pdf&uid=" . $uidString,
-						"scope" => "prestudent"
-					]
+					$this->buildDropdownEntry("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					$this->buildDropdownEntry("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					$this->buildDropdownEntry("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					$this->buildDropdownEntry("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
 				]
 			],
-			[
-				"id"   => "zutrittskarte",
-				"type" => "documenturl",
-				"name" => "Zutrittskarte",
-				"url"  => "zutrittskarte.php?xsl=ZutrittskarteStud&output=pdf&data=" . $uidString,
-				"scope" => "prestudent"
-			],
-			[
-				"id"   => "zutrittskarte",
-				"type" => "parameterurl",
-				"name" => "Zutrittskarte",
-				"baseurl" => "zutrittskarte.php",
- 				"parameterurl" =>"xsl=ZutrittskarteStud&output=pdf&data=" . $uidString,
-				"scope" => "prestudent"
-			],
-			[
-				"id"   => "studienbestaetigung",
-				"type" => "documenturl",
-				"name" => "Studienbestätigung",
-				"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
-				"scope" => "prestudent"
-			],
-			[
-				"id"   => "studienerfolg",
-				"type" => "documenturl",
-				"name" => "Studienbestätigung",
-				"url"  => "pdfExport.php?xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&uid=" . $uidString,
-				"scope" => "prestudent"
-			],
 
+			$this->loadDropDownEntriesFinalExam($hasPermissionOutputformat, $stgTyp, $uidString),
+
+			//TODO(Manu) also in Fas multi not working
+/*			$this->buildDropdownEntry("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uidString, 80, null),
+			*/
+
+			$this->buildDropdownEntry("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uidString, 81, null)
 		];
 
-/*		Events::trigger('DocumentGenerationDropDownMulti',
+		Events::trigger('DocumentGenerationDropDownMulti',
 			// passing $menu per reference
 			function & () use (&$documents) {
 				return $documents;
 			},
-			$prestudent_id,
+			$studentUids,
 			$studiensemester_kurzbz,
 			$studiengang_kz
-		);*/
+		);
 
 		usort($documents, function ($a, $b) {
 			$orderA = isset($a['order']) ? (int)$a['order'] : PHP_INT_MAX;
@@ -796,7 +727,6 @@ class Dokumente extends FHCAPI_Controller
 			return $orderA <=> $orderB;
 		});
 
-	//	FireEvent(DocumentGenerationDropDownMulti(&$documents);
 
 		$this->terminateWithSuccess($documents);
 
@@ -977,9 +907,7 @@ class Dokumente extends FHCAPI_Controller
 		else if ($stgTyp == 'm' || $stgTyp == 'd')
 			$postfix = 'Master';
 		else
-			//TODO(Manu) sollte nicht null sein!! -> dropdown wird  im Falle von Lehrgängen nicht erstellt
-			return null;
-
+			return [];
 
 		$arrayFinalExam = [
 			'pruefungsprotokoll' => [
diff --git a/public/js/api/factory/stv/documents.js b/public/js/api/factory/stv/documents.js
index 37ec8298b..633afcba1 100644
--- a/public/js/api/factory/stv/documents.js
+++ b/public/js/api/factory/stv/documents.js
@@ -74,16 +74,15 @@ export default {
 		};
 	},
 	getDocumentDropdown(params){
-	console.log(params);
 		return {
 			method: 'get',
 			url: 'api/frontend/v1/stv/dokumente/getDocumentDropDown/' + params.prestudent_id + '/' + params.studiensemester_kurzbz + '/' + params.studiengang_kz,
 		};
 	},
-	getDocumentDropdownMulti(studentUids){
+	getDocumentDropdownMulti(studentUids, params){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/dokumente/getDocumentDropDownMulti/',
+			url: 'api/frontend/v1/stv/dokumente/getDocumentDropDownMulti/' + params.studiensemester_kurzbz + '/' + params.studiengang_kz,
 			params: {studentUids}
 		};
 	}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index f439d0135..dabb000d1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -224,14 +224,11 @@ export default {
 			return retval;
 		},
 		showDropDownMulti(){
-
 			if (this.modelValue.length) {
-				console.log("started comp property showDropdown Multi " + this.modelValue.length);
 				return true;
 			}
 			return false;
 		}
-
 	},
 	watch: {
 		modelValue() {
@@ -308,17 +305,18 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		if (this.modelValue.length) {
-			console.log("multi" + this.modelValue.length);
-			console.log(this.studentUids);
+			const params = {
+				studiensemester_kurzbz: this.currentSemester,
+				studiengang_kz: this.stg_kz
+			};
 			this.$api
-				.call(ApiStvDocuments.getDocumentDropdownMulti(this.studentUids))
+				.call(ApiStvDocuments.getDocumentDropdownMulti(this.studentUids, params))
 				.then(result => {
 					console.log(result);
 					this.documentDropdownObject = result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		} else {
-			console.log("single");
 			const params = {
 				prestudent_id: this.modelValue.prestudent_id,
 				studiensemester_kurzbz: this.currentSemester,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
index 215a1f1ca..001a45ed8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
@@ -34,7 +34,6 @@ export default {
 		printDokument(url, scope){
 			//TODO Manu(check if logic not in content (Zutrittkarte also in content folder))
 			let linkToPdf = this.cisRoot + 'content/' + url;
-			console.log("in print " + linkToPdf + " scope" + scope);
 			window.open(linkToPdf, '_blank');
 		}
 	},
@@ -42,71 +41,57 @@ export default {
 	<div class="stv-document-dropdown">
 		<div class="btn-group">
 			<button
-				v-if="!showDropDownMulti"
 				ref="toolbarButton"
 				type="button"
-				class="btn btn-secondary dropdown-toggle"
+				class="btn btn-secondary dropdown-toggle px-5 ms-4"
 				data-bs-toggle="dropdown"
 				data-bs-auto-close="outside"
 				aria-expanded="false"
-				@[\`show.bs.dropdown\`]="event => { if (event.target.closest('.tabulator-row')) event.target.closest('.tabulator-row').style.zIndex = 12 }"
-				@[\`hidden.bs.dropdown\`]="event => { if (event.target.closest('.tabulator-row')) event.target.closest('.tabulator-row').style.zIndex = '' }"
 				>
 				{{this.$p.t('dokumente','dokument_erstellen')}}
 			</button>
-			<button
-				v-else
-				ref="toolbarButton"
-				type="button"
-				class="btn btn-secondary dropdown-toggle"
-				data-bs-toggle="dropdown"
-				data-bs-auto-close="outside"
-				aria-expanded="false"
-				>
-				multi: {{this.$p.t('tools','dokument_erstellen')}}
-			</button>
 
-		  <ul class="dropdown-menu dropdown-menu-right">
-			<template v-for="doc in documents" :key="doc.id">
-				<li v-if="doc.type === 'documenturl'">
-				  <button class="dropdown-item" type="button" @click="printDokument(doc.url, doc.scope)">
-				  {{ doc.name }}
-				  </button>
-				</li>
+			<ul class="dropdown-menu dropdown-menu-right">
+				<template v-for="doc in documents" :key="doc.id">
+					<li v-if="doc.type === 'documenturl'">
+					  <button class="dropdown-item" type="button" @click="printDokument(doc.url, doc.scope)">
+					  {{ doc.name }}
+					  </button>
+					</li>
 
-				<li v-else-if="doc.type === 'submenu'" class="dropend">
-				  <a
-				  class="dropdown-item dropdown-toggle"
-				  href="#"
-				  role="button"
-				  data-bs-toggle="dropdown"
-				  aria-expanded="false"
-				  >
-				  {{ doc.name }}
-				  </a>
+					<li v-else-if="doc.type === 'submenu'" class="dropend">
+					  <a
+					  class="dropdown-item dropdown-toggle"
+					  href="#"
+					  role="button"
+					  data-bs-toggle="dropdown"
+					  aria-expanded="false"
+					  >
+					  {{ doc.name }}
+					  </a>
 
-				  <ul class="dropdown-menu">
-					  <template v-for="child in doc.data" :key="child.id">
-						<li v-if="child.type === 'documenturl'">
-						<button class="dropdown-item" type="button" @click="printDokument(child.url, child.scope)">
-						  {{ child.name }}
-						</button>
-						</li>
-						<li v-else-if="child.type === 'submenu'" class="dropend">
-						<a
-						  class="dropdown-item dropdown-toggle"
-						  href="#"
-						  role="button"
-						  data-bs-toggle="dropdown"
-						  aria-expanded="false"
-						>
-						  {{ child.name }}
-						</a>
-						</li>
-					  </template>
-				  </ul>
-				</li>
-			</template>
+					  <ul class="dropdown-menu">
+						  <template v-for="child in doc.data" :key="child.id">
+							<li v-if="child.type === 'documenturl'">
+							<button class="dropdown-item" type="button" @click="printDokument(child.url, child.scope)">
+							  {{ child.name }}
+							</button>
+							</li>
+							<li v-else-if="child.type === 'submenu'" class="dropend">
+							<a
+							  class="dropdown-item dropdown-toggle"
+							  href="#"
+							  role="button"
+							  data-bs-toggle="dropdown"
+							  aria-expanded="false"
+							>
+							  {{ child.name }}
+							</a>
+							</li>
+						  </template>
+					  </ul>
+					</li>
+				</template>
 		  </ul>
 
 	</div>

From 3cdb391a6da2336722d391ea09fa07e441af20e7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 28 Aug 2025 14:29:26 +0200
Subject: [PATCH 033/101] use helper file instead of private function for
 building dropdown entry

---
 .../api/frontend/v1/stv/Dokumente.php         | 108 ++++++------------
 application/helpers/hlp_common_helper.php     |  42 +++++++
 .../Stv/Studentenverwaltung/Details/Archiv.js |   2 -
 3 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 17be3b9df..e6f6f4351 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -572,6 +572,7 @@ class Dokumente extends FHCAPI_Controller
 
 	public function getDocumentDropDown($prestudent_id, $studiensemester_kurzbz, $studiengang_kz)
 	{
+		$this->load->helper('hlp_common');
 		//permission to create also odt, and doc outputs of certain documents(menu abschlusspruefung)
 		$hasPermissionOutputformat = $this->permissionlib->isBerechtigt('system/change_outputformat', 's');
 
@@ -588,14 +589,14 @@ class Dokumente extends FHCAPI_Controller
 		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
 
 		$documents = [
-			$this->buildDropdownEntry("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null),
-			$this->buildDropdownEntry("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uid, 20, null),
-			$this->buildDropdownEntry("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uid, 21, null),
-			$this->buildDropdownEntry("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uid, 40, null),
-			$this->buildDropdownEntry("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uid, 41, null),
-			$this->buildDropdownEntry("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uid", $uid,100, "zutrittskarte.php"),
-			$this->buildDropdownEntry("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uid, 60, null),
-			$this->buildDropdownEntry("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uid, 61, null),
+			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uid, 20, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uid, 21, null),
+			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uid, 40, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uid, 41, null),
+			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uid", $uid,100, "zutrittskarte.php"),
+			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uid, 60, null),
+			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uid, 61, null),
 
 			$this->buildStudienerfolgSubmenu("de", $uid, $semArray, $studiensemester_kurzbz),
 			$this->buildStudienerfolgSubmenu("en", $uid, $semArray, $studiensemester_kurzbz),
@@ -608,17 +609,17 @@ class Dokumente extends FHCAPI_Controller
 				"name" => "Verwaltung des StudierendenStatus",
 				"order" => 110,
 				"data" => [
-					$this->buildDropdownEntry("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
-					$this->buildDropdownEntry("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
-					$this->buildDropdownEntry("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
-					$this->buildDropdownEntry("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					buildDropdownEntryPrintArray("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					buildDropdownEntryPrintArray("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					buildDropdownEntryPrintArray("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					buildDropdownEntryPrintArray("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
 				]
 			],
 
 			$this->loadDropDownEntriesFinalExam($hasPermissionOutputformat, $stgTyp, $uid),
 
-			$this->buildDropdownEntry("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 80, null),
-			$this->buildDropdownEntry("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 81, null)
+			buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 80, null),
+			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 81, null)
 		];
 
 		Events::trigger('DocumentGenerationDropDown',
@@ -674,14 +675,14 @@ class Dokumente extends FHCAPI_Controller
 		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
 
 		$documents = [
-			$this->buildDropdownEntry("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uidString, 10, null),
-			$this->buildDropdownEntry("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uidString, 20, null),
-			$this->buildDropdownEntry("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uidString, 21, null),
-			$this->buildDropdownEntry("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uidString, 40, null),
-			$this->buildDropdownEntry("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uidString, 41, null),
-			$this->buildDropdownEntry("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uidString", $uidString,100, "zutrittskarte.php"),
-			$this->buildDropdownEntry("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uidString, 60, null),
-			$this->buildDropdownEntry("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uidString, 61, null),
+			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uidString, 10, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uidString, 20, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uidString, 21, null),
+			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uidString, 40, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uidString, 41, null),
+			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uidString", $uidString,100, "zutrittskarte.php"),
+			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uidString, 60, null),
+			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uidString, 61, null),
 
 			// Studienerfolg Menüs automatisch
 			$this->buildStudienerfolgSubmenu("de", $uidString, $semArray, $studiensemester_kurzbz),
@@ -695,20 +696,20 @@ class Dokumente extends FHCAPI_Controller
 				"name" => "Verwaltung des StudierendenStatus",
 				"order" => 110,
 				"data" => [
-					$this->buildDropdownEntry("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
-					$this->buildDropdownEntry("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
-					$this->buildDropdownEntry("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
-					$this->buildDropdownEntry("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					buildDropdownEntryPrintArray("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					buildDropdownEntryPrintArray("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					buildDropdownEntryPrintArray("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					buildDropdownEntryPrintArray("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
 				]
 			],
 
 			$this->loadDropDownEntriesFinalExam($hasPermissionOutputformat, $stgTyp, $uidString),
 
 			//TODO(Manu) also in Fas multi not working
-/*			$this->buildDropdownEntry("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uidString, 80, null),
+/*			buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uidString, 80, null),
 			*/
 
-			$this->buildDropdownEntry("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uidString, 81, null)
+			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uidString, 81, null)
 		];
 
 		Events::trigger('DocumentGenerationDropDownMulti',
@@ -806,47 +807,6 @@ class Dokumente extends FHCAPI_Controller
 		return $typStudiengang;
 	}
 
-	//TODO(Manu) make helperfunction
-	/**
-	 * is building an array for Dropdown Entry in Print Dropdown
-	 * @param $id id for the Document to add to the Document Array
-	 * @param $name name of the dropdownEntry
-	 * @param $parameterUrl url of parameters xml, xsl,format as needed
-	 * 	WITHOUT BASEURL eg. "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf"
-	 * @param $uid default parameter, if null only parameterurl will be added
-	 * 	additional needed parameter: put in the parameterUrl
-	 * @param $alternativeBaseUrl: if baseUrl not pdfExport.php, put here alternative without ? char, eg. "zutrittskarte.php"
-
-	 * @return Array
-	 */
-	private function buildDropdownEntry($id, $name, $parameterurl, $uid=null, $order=null, $alternativeBaseUrl=null)
-	{
-		//DEFAULT BASEURL
-		$baseurl = "pdfExport.php?";
-
-		$uidString = $uid ? "&uid=" . $uid : "";
-
-		if($alternativeBaseUrl)
-		{
-			return [
-				"id"    => $id,
-				"type"  => "documenturl",
-				"name"  => $name,
-				"url"   => $alternativeBaseUrl . "?" . $parameterurl . $uidString,
-				"order" => $order
-			];
-		}
-		else
-			return [
-				"id"    => $id,
-				"type"  => "documenturl",
-				"name"  => $name,
-				"url"   => $baseurl . $parameterurl . "&uid=" . $uid,
-				"order" => $order
-			];
-
-	}
-
 	/**
 	 * helper function to create ArrayStructure
 	 * actual studiensemester plus the 5 studiensemester in the past
@@ -860,7 +820,7 @@ class Dokumente extends FHCAPI_Controller
 		$xsl = $lang === "de" ? "Studienerfolg" : "StudienerfolgEng";
 		$idPrefix = "submenu_studienerfolg_" . $lang . ($fa ? "_fa" : "");
 
-		$entries[] = $this->buildDropdownEntry(
+		$entries[] = buildDropdownEntryPrintArray(
 			$idPrefix . "_aktuell",
 			"ausgewähltes Semester",
 			"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$studiensemester_kurzbz" . ($fa ? "&typ=finanzamt" : ""),
@@ -868,7 +828,7 @@ class Dokumente extends FHCAPI_Controller
 		);
 
 		//all semester
-		$entries[] = $this->buildDropdownEntry(
+		$entries[] = buildDropdownEntryPrintArray(
 			$idPrefix . "_all",
 			"alle Semester",
 			"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$studiensemester_kurzbz&all=true" . ($fa ? "&typ=finanzamt" : ""),
@@ -877,7 +837,7 @@ class Dokumente extends FHCAPI_Controller
 
 		//sem from array
 		foreach ($semArray as $i => $sem) {
-			$entries[] = $this->buildDropdownEntry(
+			$entries[] = buildDropdownEntryPrintArray(
 				$idPrefix . ($i === 0 ? "_akt" : "_minus" . $i),
 				$sem,
 				"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$sem" . ($fa ? "&typ=finanzamt" : ""),
@@ -965,7 +925,7 @@ class Dokumente extends FHCAPI_Controller
 
 					//3 outputformates
 					foreach (["pdf", "odt", "docx"] as $format) {
-						$submenuData[] = $this->buildDropdownEntry(
+						$submenuData[] = buildDropdownEntryPrintArray(
 							$idPrefix . "_" . $format,
 							$baseName . " (" . strtoupper($format) . ")",
 							$baseUrl . "&output=" . $format,
@@ -986,7 +946,7 @@ class Dokumente extends FHCAPI_Controller
 
 					$url = "xml=abschlusspruefung.rdf.php&xsl=" . $xsl . "&output=pdf";
 
-					$submenuData[] = $this->buildDropdownEntry($id, $name, $url, $uid);
+					$submenuData[] = buildDropdownEntryPrintArray($id, $name, $url, $uid);
 				}
 			}
 		}
diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index 00c0a1b93..ad030c075 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -515,3 +515,45 @@ function has_permissions_for_stg($studiengang_kz, $permissions = '')
 
 	return false;
 }
+
+/**
+ * is building an array for Dropdown Entry in Print Dropdown
+ * @param $id id for the Document to add to the Document Array
+ * @param $name title of the dropdownEntry
+ * @param $parameterUrl url of parameters xml, xsl, format etc as needed
+ * 	WITHOUT BASEURL eg. "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf"
+ * @param $uid default parameter, if null only parameterurl will be added
+ * 	additional needed parameter: put in the parameterUrl
+ * @param $alternativeBaseUrl: if baseUrl not pdfExport.php, put here alternative without ? char, eg. "zutrittskarte.php"
+ *
+ * @return Array
+ */
+function buildDropdownEntryPrintArray($id, $name, $parameterurl, $uid=null, $order=null, $alternativeBaseUrl=null)
+{
+	//DEFAULT BASEURL
+	$baseurl = "pdfExport.php?";
+
+	$uidString = $uid ? "&uid=" . $uid : "";
+
+
+
+	if($alternativeBaseUrl)
+	{
+		return [
+			"id"    => $id,
+			"type"  => "documenturl",
+			"name"  => $name,
+			"url"   => $alternativeBaseUrl . "?" . $parameterurl . $uidString,
+			"order" => $order
+		];
+	}
+	else
+		return [
+			"id"    => $id,
+			"type"  => "documenturl",
+			"name"  => $name,
+			"url"   => $baseurl . $parameterurl . "&uid=" . $uid,
+			"order" => $order
+		];
+
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index dabb000d1..a3ac6593b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -312,7 +312,6 @@ export default {
 			this.$api
 				.call(ApiStvDocuments.getDocumentDropdownMulti(this.studentUids, params))
 				.then(result => {
-					console.log(result);
 					this.documentDropdownObject = result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -325,7 +324,6 @@ export default {
 			this.$api
 				.call(ApiStvDocuments.getDocumentDropdown(params))
 				.then(result => {
-					console.log(result);
 					this.documentDropdownObject = result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);

From fc845ebf4e75c1ec26b32186eef8b8f02ab6ea37 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 2 Sep 2025 15:04:45 +0200
Subject: [PATCH 034/101] Studierendenverwaltung Projektarbeit: separate saving
 of Projektarbeit and Betreuer, added action for editing Betreuer

---
 .../api/frontend/v1/stv/Projektarbeit.php     |   6 +-
 .../api/frontend/v1/stv/Projektbetreuer.php   |  65 +++---
 .../education/Lehrveranstaltung_model.php     |  57 ++++++
 public/js/api/factory/stv/projektarbeit.js    |   2 +-
 public/js/api/factory/stv/projektbetreuer.js  |   4 +-
 .../Details/Projektarbeit/Details.js          |   5 +-
 .../Details/Projektarbeit/Projektarbeit.js    | 188 +++++++++---------
 .../Details/Projektarbeit/Projektbetreuer.js  |  82 +++-----
 system/phrasesupdate.php                      |  60 ++++--
 9 files changed, 248 insertions(+), 221 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index e7d1af1f9..75478332f 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -310,13 +310,13 @@ class Projektarbeit extends FHCAPI_Controller
 			'projekttyp_kurzbz' => $formData['projekttyp_kurzbz'],
 			'firma_id' => $formData['firma_id'] ?? null,
 			'lehreinheit_id' => $formData['lehreinheit_id'],
-			'beginn' => $formData['beginn'] ?? null,
-			'ende' => $formData['ende'] ?? null,
+			'beginn' => isset($formData['beginn']) && !isEmptyString($formData['beginn']) ? $formData['beginn'] : null,
+			'ende' => isset($formData['ende']) && !isEmptyString($formData['ende']) ? $formData['ende'] : null,
 			'note' => $formData['note'] ?? null,
 			'final' => $formData['final'] ?? null,
 			'freigegeben' => $formData['freigegeben'] ?? null,
 			'anmerkung' => $formData['anmerkung'] ?? null,
-			'gesperrtbis' => $formData['gesperrtbis'] ?? null
+			'gesperrtbis' => isset($formData['gesperrtbis']) && !isEmptyString($formData['gesperrtbis']) ? $formData['gesperrtbis'] : null
 		];
 	}
 
diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index 625a30c40..98567ecde 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -114,49 +114,40 @@ class Projektbetreuer extends FHCAPI_Controller
 		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
 			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
 
-		$projektbetreuer = $this->input->post('projektbetreuerListe');
+		$projektbetreuer = $this->input->post('projektbetreuer');
 
-		if (!is_array($projektbetreuer))
-			return $this->terminateWithError($this->p->t('projektarbeit', 'error_invalidProjektbetreuer'), self::ERROR_TYPE_GENERAL);
-
-		foreach ($projektbetreuer as $pb)
-		{
-			if ($this->_validate($pb) == false) $this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
+		if ($this->_validate($projektbetreuer) == false) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		$result = null;
 
-		foreach ($projektbetreuer as $pb)
+		$betreuer = [
+			'projektarbeit_id' => $projektarbeit_id,
+			'person_id' => $projektbetreuer['person_id'],
+			'note' => $projektbetreuer['note'],
+			'stunden' => $projektbetreuer['stunden'],
+			'stundensatz' => $projektbetreuer['stundensatz'],
+			'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz']
+		];
+
+		if (isset($projektbetreuer['person_id_old']) && isset($projektbetreuer['betreuerart_kurzbz_old']))
 		{
-			$betreuer = [
-				'projektarbeit_id' => $projektarbeit_id,
-				'person_id' => $pb['person_id'],
-				'note' => $pb['note'],
-				'stunden' => $pb['stunden'],
-				'stundensatz' => $pb['stundensatz'],
-				'betreuerart_kurzbz' => $pb['betreuerart_kurzbz']
-			];
-
-			if (isset($pb['person_id_old']) && isset($pb['betreuerart_kurzbz_old']))
-			{
-				$result = $this->ProjektbetreuerModel->update(
-					[
-						'projektarbeit_id' => $projektarbeit_id,
-						'person_id' => $pb['person_id_old'],
-						'betreuerart_kurzbz' => $pb['betreuerart_kurzbz_old']
-					],
-					array_merge($betreuer, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
-				);
-			}
-			else
-			{
-				$result = $this->ProjektbetreuerModel->insert(
-					array_merge($betreuer, ['insertamum' => date('c'), 'insertvon' => getAuthUID()])
-				);
-			}
-
-			if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$result = $this->ProjektbetreuerModel->update(
+				[
+					'projektarbeit_id' => $projektarbeit_id,
+					'person_id' => $projektbetreuer['person_id_old'],
+					'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz_old']
+				],
+				array_merge($betreuer, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
+			);
 		}
+		else
+		{
+			$result = $this->ProjektbetreuerModel->insert(
+				array_merge($betreuer, ['insertamum' => date('c'), 'insertvon' => getAuthUID()])
+			);
+		}
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
 		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 1b3b9e9d7..7347cf2ca 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -1255,4 +1255,61 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, $params);
 	}
+
+	/**
+	 * Gets Lehrveranstaltungen for a student, as needed for a Projektarbeit.
+	 * @param student_uid
+	 * @param studiengang_kz optional, all Lvs of this Studiengang will be included 
+	 * @param additional_lehrveranstaltung_id optional, this lv will be added to result
+	 * @return object success or error
+	 */
+	public function getLvsForProjektarbeit($student_uid, $studiengang_kz = null, $additional_lehrveranstaltung_id = null)
+	{
+		$params = array($student_uid, $student_uid);
+
+		$qry = "
+			SELECT *
+			FROM
+				lehre.tbl_lehrveranstaltung
+			WHERE
+				(
+					lehrveranstaltung_id IN (
+
+						SELECT
+							lehrveranstaltung_id
+						FROM
+							campus.vw_student_lehrveranstaltung
+						WHERE
+							uid=?
+
+						UNION
+
+						SELECT
+							lehrveranstaltung_id
+						FROM
+							lehre.tbl_zeugnisnote
+						WHERE
+							student_uid=?
+					)";
+
+		if (isset($studiengang_kz))
+		{
+			$params[] = $studiengang_kz;
+			$qry .= " OR (studiengang_kz = ? AND semester IS NOT NULL)";
+		}
+
+		if (isset($additional_lehrveranstaltung_id))
+		{
+			$params[] = $additional_lehrveranstaltung_id;
+			$qry .= " OR lehrveranstaltung_id = ?";
+		}
+
+		$qry .= "
+				)
+				AND projektarbeit = TRUE
+			ORDER BY
+				semester, bezeichnung";
+
+		return $this->execQuery($qry, $params);
+	}
 }
diff --git a/public/js/api/factory/stv/projektarbeit.js b/public/js/api/factory/stv/projektarbeit.js
index 243383de0..4412f1842 100644
--- a/public/js/api/factory/stv/projektarbeit.js
+++ b/public/js/api/factory/stv/projektarbeit.js
@@ -77,4 +77,4 @@ export default {
 			params: { projektarbeit_id }
 		};
 	}
-};
\ No newline at end of file
+};
diff --git a/public/js/api/factory/stv/projektbetreuer.js b/public/js/api/factory/stv/projektbetreuer.js
index 211eaaca8..4ea7bc782 100644
--- a/public/js/api/factory/stv/projektbetreuer.js
+++ b/public/js/api/factory/stv/projektbetreuer.js
@@ -42,11 +42,11 @@ export default {
 			url: 'api/frontend/v1/stv/projektbetreuer/getNoten'
 		};
 	},
-	saveProjektbetreuer(projektarbeit_id, projektbetreuerListe) {
+	saveProjektbetreuer(projektarbeit_id, projektbetreuer) {
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/projektbetreuer/saveProjektbetreuer',
-			params: { projektarbeit_id, projektbetreuerListe }
+			params: { projektarbeit_id, projektbetreuer }
 		};
 	},
 	deleteProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index 2fdc9d996..b7aea7169 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -15,10 +15,6 @@ export default {
 		defaultSemester: {
 			from: 'defaultSemester'
 		}
-		//~ config: {
-			//~ from: 'config',
-			//~ required: true
-		//~ }
 	},
 	computed: {
 		// prepared Lehreinheiten (with compound Bezeichnung)
@@ -169,6 +165,7 @@ export default {
 		},
 		loadProjektarbeit(projektarbeit_id) {
 
+			this.resetForm();
 			return this.$api
 				.call(ApiStvProjektarbeit.loadProjektarbeit(projektarbeit_id))
 				.then(result => {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 76953867f..952c47860 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -36,7 +36,63 @@ export default {
 	},
 	data() {
 		return {
-			tabulatorOptions: {
+			tabulatorEvents: [
+				{
+					event: 'dataLoaded',
+					handler: data => this.tabulatorData = data.map(item => {
+						item.actionDiv = document.createElement('div');
+						return item;
+					}),
+				},
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'person', 'stv', 'ui', 'projektarbeit']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('projekttyp_kurzbz').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'typ')
+						});
+						cm.getColumnByField('titel').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'titel')
+						});
+						cm.getColumnByField('beginn').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'beginn')
+						});
+						cm.getColumnByField('ende').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'ende')
+						});
+						cm.getColumnByField('freigegeben').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'freigegeben')
+						});
+						cm.getColumnByField('gesperrtbis').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'gesperrtBis')
+						});
+						cm.getColumnByField('themenbereich').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'themenbereich')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'anmerkung')
+						});
+						cm.getColumnByField('firma_id').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'firmaId')
+						});
+					}
+				},
+			],
+			tabulatorData: [],
+			//lastSelected: null,
+			editedProjektarbeit: null,
+			statusNew: true,
+			studiensemester_kurzbz: null,
+			lehrveranstaltung_id: null,
+			activeTab: 'details'
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvProjektarbeit.getProjektarbeit(this.student.uid)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -153,9 +209,19 @@ export default {
 							button.title = this.$p.t('ui', 'bearbeiten');
 							button.addEventListener('click', (event) => {
 								let data = cell.getData();
-								this.actionEditProjektarbeit(
-									data.projektarbeit_id, data.studiensemester_kurzbz, data.lehrveranstaltung_id, data.projekttyp_kurzbz
-								);
+								this.editedProjektarbeit = data;
+								this.actionEditProjektarbeit();
+							});
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-users"></i>';
+							button.title = this.$p.t('projektarbeit', 'betreuerBearbeiten');
+							button.addEventListener('click', (event) => {
+								let data = cell.getData();
+								this.editedProjektarbeit = data;
+								this.actionEditBetreuer();
 							});
 							container.append(button);
 
@@ -184,76 +250,27 @@ export default {
 					columns: true, //persist column layout
 				},
 				persistenceID: 'stv-details-projektarbeit'
-			},
-			tabulatorEvents: [
-				{
-					event: 'rowSelectionChanged',
-					handler: this.rowSelectionChanged
-				},
-				{
-					event: 'dataLoaded',
-					handler: data => this.tabulatorData = data.map(item => {
-						item.actionDiv = document.createElement('div');
-						return item;
-					}),
-				},
-				{
-					event: 'tableBuilt',
-					handler: async() => {
-						await this.$p.loadCategory(['global', 'person', 'stv', 'ui', 'projektarbeit']);
-
-						let cm = this.$refs.table.tabulator.columnManager;
-
-						cm.getColumnByField('projekttyp_kurzbz').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'typ')
-						});
-						cm.getColumnByField('titel').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'titel')
-						});
-						cm.getColumnByField('beginn').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'beginn')
-						});
-						cm.getColumnByField('ende').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'ende')
-						});
-						cm.getColumnByField('freigegeben').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'freigegeben')
-						});
-						cm.getColumnByField('gesperrtbis').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'gesperrtBis')
-						});
-						cm.getColumnByField('themenbereich').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'themenbereich')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'anmerkung')
-						});
-						cm.getColumnByField('firma_id').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'firmaId')
-						});
-					}
-				},
-			],
-			tabulatorData: [],
-			lastSelected: null,
-			statusNew: true,
-			studiensemester_kurzbz: null,
-			lehrveranstaltung_id: null
+			}
+			return options;
 		}
 	},
 	methods: {
 		actionNewProjektarbeit() {
 			this.statusNew = true;
-			this.$refs.projektarbeitDetails.resetForm();
 			this.$refs.projektarbeitDetails.getFormData(this.statusNew);
-			this.$refs.projektbetreuer.getData();
 			this.$refs.projektarbeitModal.show();
 		},
-		actionEditProjektarbeit(projektarbeit_id, studiensemester_kurzbz, lehrveranstaltung_id, projekttyp_kurzbz) {
+		actionEditProjektarbeit() {
 			this.statusNew = false;
-			this.$refs.projektarbeitDetails.getFormData(this.statusNew, studiensemester_kurzbz, lehrveranstaltung_id);
-			this.$refs.projektarbeitDetails.loadProjektarbeit(projektarbeit_id);
-			this.$refs.projektbetreuer.getData(projektarbeit_id, studiensemester_kurzbz, projekttyp_kurzbz);
+			this.toggleMenu('details');
+			this.$refs.projektarbeitDetails.getFormData(this.statusNew, this.editedProjektarbeit.studiensemester_kurzbz, this.editedProjektarbeit.lehrveranstaltung_id);
+			this.$refs.projektarbeitDetails.loadProjektarbeit(this.editedProjektarbeit.projektarbeit_id);
+			this.$refs.projektarbeitModal.show();
+		},
+		actionEditBetreuer() {
+			this.statusNew = false;
+			this.toggleMenu('betreuer');
+			this.$refs.projektbetreuer.getData(this.editedProjektarbeit.projektarbeit_id, this.editedProjektarbeit.studiensemester_kurzbz, this.editedProjektarbeit.projekttyp_kurzbz);
 			this.$refs.projektarbeitModal.show();
 		},
 		actionDeleteProjektarbeit(projektarbeit_id) {
@@ -266,34 +283,14 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		addNewProjektarbeit() {
-			this.$refs.projektbetreuer.validateProjektbetreuer()
-				.then(() => {
-					return this.$refs.projektarbeitDetails.addNewProjektarbeit();
-				})
-				.then((result) => {
-					const projektarbeit_id = result.data;
-
-					if (!isNaN(projektarbeit_id)) {
-						return this.$refs.projektbetreuer.saveProjektbetreuer(projektarbeit_id);
-					}
-				})
+			this.$refs.projektarbeitDetails.addNewProjektarbeit()
 				.then((result) => {
 					this.projektarbeitSaved();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateProjektarbeit() {
-			this.$refs.projektbetreuer.validateProjektbetreuer()
-				.then(() => {
-					return this.$refs.projektarbeitDetails.updateProjektarbeit();
-				})
-				.then((result) => {
-					const projektarbeit_id = result.data;
-
-					if (!isNaN(projektarbeit_id)) {
-						return this.$refs.projektbetreuer.saveProjektbetreuer(projektarbeit_id);
-					}
-				})
+			this.$refs.projektarbeitDetails.updateProjektarbeit()
 				.then((result) => {
 					this.projektarbeitSaved();
 				})
@@ -314,10 +311,6 @@ export default {
 			this.reload();
 			this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 			this.hideModal('projektarbeitModal');
-			this.$refs.projektarbeitDetails.resetForm();
-		},
-		rowSelectionChanged(data) {
-			this.lastSelected = data.length > 0 ? data[0] : null;
 		},
 		setDefaultStunden(projekttyp_kurzbz) {
 			this.$refs.projektbetreuer.setDefaultStunden(projekttyp_kurzbz);
@@ -327,6 +320,9 @@ export default {
 		},
 		reload() {
 			this.$refs.table.reloadTable();
+		},
+		toggleMenu(tabId) {
+			this.activeTab = tabId;
 		}
 	},
 	template: `
@@ -357,16 +353,16 @@ export default {
 			<template #modal-header-content>
 				<ul class="nav nav-tabs w-100 mt-3 msg_preview" id="pa_tabs" role="tablist">
 					<li class="nav-item" role="presentation">
-						<button class="nav-link active" id="details-tab" data-bs-toggle="tab" data-bs-target="#details" type="button" role="tab" aria-controls="details" aria-selected="true">Details</button>
+						<button class="nav-link" :class="activeTab == 'details' ? 'active' : ''" id="details-tab" data-bs-toggle="tab" data-bs-target="#details" type="button" role="tab" aria-controls="details" aria-selected="true" @click="actionEditProjektarbeit">Details</button>
 					</li>
 					<li class="nav-item" role="presentation">
-						<button class="nav-link" id="betreuer-tab" data-bs-toggle="tab" data-bs-target="#betreuer" type="button" role="tab" aria-controls="betreuer" aria-selected="false">{{$p.t('projektarbeit', 'betreuerGross')}}</button>
+						<button class="nav-link" :class="activeTab == 'betreuer' ? 'active' : ''" id="betreuer-tab" data-bs-toggle="tab" data-bs-target="#betreuer" type="button" role="tab" aria-controls="betreuer" aria-selected="false" @click="actionEditBetreuer">{{$p.t('projektarbeit', 'betreuerGross')}}</button>
 					</li>
 				</ul>
 			</template>
 
 			<div class="tab-content" id="pa_content">
-				<div class="tab-pane fade show active" id="details" role="tabpanel" aria-labelledby="details-tab">
+				<div class="tab-pane fade show" :class="activeTab == 'details' ? 'active' : ''" id="details" role="tabpanel" aria-labelledby="details-tab">
 					<div class="row">
 						<div class="col-12">
 							<projektarbeit-details ref="projektarbeitDetails" :student="student" @projekttyp-changed="setDefaultStunden">
@@ -375,7 +371,7 @@ export default {
 					</div>
 				</div>
 
-				<div class="tab-pane fade show" id="betreuer" role="tabpanel" aria-labelledby="betreuer-tab">
+				<div class="tab-pane fade show" :class="activeTab == 'betreuer' ? 'active' : ''" id="betreuer" role="tabpanel" aria-labelledby="betreuer-tab">
 					<div class="row">
 						<div class="col-12">
 							<projektbetreuer ref="projektbetreuer" :config="config"></projektbetreuer>
@@ -387,7 +383,7 @@ export default {
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 					<button v-if="statusNew" class="btn btn-primary" @click="addNewProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
-					<button v-else class="btn btn-primary" @click="updateProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
+					<button v-if="!statusNew && activeTab == 'details'" class="btn btn-primary" @click="updateProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
 			</template>
 
 		</bs-modal>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 183c81bc0..1eb19e3fd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -132,6 +132,10 @@ export default {
 					event: 'tableBuilt',
 					handler: async() => {
 						await this.$p.loadCategory(['global', 'person', 'stv', 'projektarbeit', 'ui']);
+
+						// Force layout recalculation for handling overflow text
+						this.$refs.projektbetreuerTable.tabulator.redraw(true);
+
 					}
 				},
 				{
@@ -193,7 +197,7 @@ export default {
 					if (idx >= 0) { // if betreuer found
 						betreuer = projektbetreuerListe[idx];
 
-						// set currently edited betreuera
+						// set currently edited betreuer
 						this.formData = betreuer;
 
 						// set download link
@@ -259,46 +263,31 @@ export default {
 
 			if (projektarbeit_id) {
 				this.projektarbeit_id = projektarbeit_id;
-				this.$api
-					.call(ApiStvProjektbetreuer.getProjektbetreuer(projektarbeit_id))
-					.then(result => {
-						this.$refs.projektbetreuerTable.tabulator.setData(this.addIds(result.data));
-						this.resetForm();
-					})
-					.catch(this.$fhcAlert.handleSystemError);
+				this.getProjektbetreuer();
 			} else {
 				this.$refs.projektbetreuerTable.tabulator.setData([]);
 				this.resetForm();
 			}
 		},
-		// confirming Betreuer means adding/updating him in list (but not yet saving in db)
-		confirmProjektbetreuer() {
-			if (!this.betreuerFormOpened) return;
-
-			if (typeof this.formData.betreuer_id == 'undefined') {
-				this.formData.betreuer_id = this.getNewBetreuerId();
-				this.$refs.projektbetreuerTable.tabulator.addData(this.addAutoCompleteBetreuerToFormData(this.formData));
-			} else {
-				this.$refs.projektbetreuerTable.tabulator.updateData([this.formData]);
-			}
-
-			this.resetModes();
-		},
-		confirmProjektbetreuerAfterValidation() {
-			//if (!this.formDataModified()) return;
-
-			this.validateProjektbetreuer()
+		getProjektbetreuer() {
+			this.$api
+				.call(ApiStvProjektbetreuer.getProjektbetreuer(this.projektarbeit_id))
 				.then(result => {
-					this.confirmProjektbetreuer();
+					this.$refs.projektbetreuerTable.tabulator.replaceData(this.addIds(result.data));
 					this.resetForm();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		saveProjektbetreuer(projektarbeit_id) {
-			this.confirmProjektbetreuer();
-			return this.$refs.formProjektbetreuer.call(
-				ApiStvProjektbetreuer.saveProjektbetreuer(projektarbeit_id, this.$refs.projektbetreuerTable.tabulator.getData())
-			);
+		saveProjektbetreuer() {
+			this.$refs.formProjektbetreuer.call(
+				ApiStvProjektbetreuer.saveProjektbetreuer(this.projektarbeit_id, this.getFormDataWithBetreuer())
+			)
+			.then(result => {
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				this.getProjektbetreuer();
+				this.resetModes();
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 		},
 		searchBetreuer(event) {
 			if (this.abortController.betreuer) {
@@ -312,16 +301,6 @@ export default {
 					this.filteredBetreuer = result.data;
 				});
 		},
-		// validate betreuer for data
-		validateProjektbetreuer() {
-			let alleBetreuer = this.$refs.projektbetreuerTable.tabulator.getData();
-
-			if (this.betreuerFormOpened) {
-				alleBetreuer.push(this.addAutoCompleteBetreuerToFormData(this.formData));
-			}
-
-			return this.$refs.formProjektbetreuer.call(ApiStvProjektbetreuer.validateProjektbetreuer(alleBetreuer));
-		},
 		resetForm() {
 			this.formData = this.getDefaultFormData();
 			if (this.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = '';
@@ -360,7 +339,7 @@ export default {
 			return betreuerListe;
 		},
 		// add the betreuer selected in automomplete to betreuer liste
-		addAutoCompleteBetreuerToFormData() {
+		getFormDataWithBetreuer() {
 			let preparedFormData = this.formData;
 
 			preparedFormData.projektarbeit_id = this.projektarbeit_id;
@@ -385,16 +364,6 @@ export default {
 			// if form data has not already been modified by user, set the default stunden
 			if (!this.formDataModified()) this.formData.stunden = this.getDefaultStunden(projekttyp_kurzbz);
 		},
-		// get a new betreuer id (max + 1) 
-		getNewBetreuerId() {
-			let max = 0;
-
-			for (const betreuer of this.$refs.projektbetreuerTable.tabulator.getData()) {
-				if (betreuer.betreuer_id > max) max = betreuer.betreuer_id;
-			}
-
-			return max + 1;
-		},
 		// check if form data has been modified since initial data has been captured
 		formDataModified() {
 			if (this.autocompleteSelectedBetreuer != null) return true;
@@ -406,9 +375,6 @@ export default {
 
 			return false;
 		},
-		reload() {
-			this.$refs.projektbetreuerTable.reloadTable();
-		},
 		actionNewPerson() {
 			this.$refs.newPersonModal.reset();
 			this.$refs.newPersonModal.open();
@@ -422,7 +388,7 @@ export default {
 			this.$api
 				.call(ApiStvProjektbetreuer.getPerson(result.person_id))
 				.then(response => {
-					// set the new person in autocomplete field
+					// set the new person in Betreuer autocomplete field
 					this.autocompleteSelectedBetreuer = response.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError)
@@ -541,8 +507,8 @@ export default {
 
 			</form-form>
 
-			<button class="btn btn-primary" v-show="betreuerFormOpened" @click="confirmProjektbetreuerAfterValidation">
-				{{ $p.t('projektarbeit', 'betreuerBestaetigen') }}
+			<button class="btn btn-primary" v-show="betreuerFormOpened" @click="saveProjektbetreuer">
+				{{ $p.t('projektarbeit', 'betreuerSpeichern') }}
 			</button>
 			<!-- <div class = "mt-5" v-if="beurteilungDownloadLink !== null">
 				<div class="mb-1">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f82019f54..7b7d38113 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -48606,26 +48606,6 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'projektarbeit',
-		'phrase' => 'betreuerBestaetigen',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'BetreuerIn bestätigen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Confirm assessor',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'projektarbeit',
@@ -49245,6 +49225,46 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'betreuerBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betreuer bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit assessor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'betreuerSpeichern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betreuer speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Save assessor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 	// FHC-4 Projektarbeiten & Vertraege ENDE
 );

From b378649b06820999fc3ba0280381bd5a9706e75c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 2 Sep 2025 16:04:02 +0200
Subject: [PATCH 035/101] add validation "is_in_db"

---
 application/helpers/hlp_common_helper.php     | 28 +++++++++++++++++++
 .../language/english/form_validation_lang.php |  1 +
 2 files changed, 29 insertions(+)

diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index 00c0a1b93..edbde5272 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -515,3 +515,31 @@ function has_permissions_for_stg($studiengang_kz, $permissions = '')
 
 	return false;
 }
+
+/**
+ * check if an entry exists in the database
+ */
+function is_in_db($key, $model = '')
+{
+	if (!$model)
+		return false;
+
+	$field = strstr($model, ":");
+	if ($field) {
+		$model = strstr($model, ":", true);
+		$field = substr($field, 1);
+	}
+
+	$CI =& get_instance();
+	$CI->load->model($model, $model);
+
+	if ($field) {
+		$result = $CI->$model->loadWhere([
+			$field => $key
+		]);
+	} else {
+		$result = $CI->$model->load($key);
+	}
+
+	return (isSuccess($result) && hasData($result));
+}
diff --git a/application/language/english/form_validation_lang.php b/application/language/english/form_validation_lang.php
index b8918a721..2777cd05e 100644
--- a/application/language/english/form_validation_lang.php
+++ b/application/language/english/form_validation_lang.php
@@ -41,3 +41,4 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 $lang['form_validation_has_write_permissions']	= 'You have no rights to edit {field} field.';
 $lang['form_validation_is_valid_date']	= 'The date format is invalid or out of range.';
 $lang['form_validation_has_permissions_for_stg']	= 'You have no rights for stg {field}.';
+$lang['form_validation_is_in_db']	= '{field} does not exist.';

From eae79e9f5eedff797babc5f1f04ab81fa1414a84 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 2 Sep 2025 16:04:47 +0200
Subject: [PATCH 036/101] CSS fix: primevue autocomplete inside bootstrap
 input-group

---
 public/css/components/primevue.css | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
index 5949d6ecc..ac1950334 100644
--- a/public/css/components/primevue.css
+++ b/public/css/components/primevue.css
@@ -5690,3 +5690,32 @@
   outline: 0;
   box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
 }
+
+/* input-group */
+/* autocomplete */
+.input-group:not(.has-validation) > .dropdown-toggle:nth-last-child(n+3) > .p-autocomplete-input,
+.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-control > .p-autocomplete-input,
+.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-select > .p-autocomplete-input,
+.input-group:not(.has-validation) > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating) > .p-autocomplete-input,
+.input-group:not(.has-validation) > .dropdown-toggle:nth-last-child(n+3) > .p-autocomplete > .p-autocomplete-input,
+.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-control > .p-autocomplete > .p-autocomplete-input,
+.input-group:not(.has-validation) > .form-floating:not(:last-child) > .form-select > .p-autocomplete > .p-autocomplete-input,
+.input-group:not(.has-validation) > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating) > .p-autocomplete > .p-autocomplete-input {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) > .p-autocomplete-input,
+.input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) > .p-autocomplete > .p-autocomplete-input {
+  margin-left: calc(var(--bs-border-width) * -1);
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.p-inputtext.is-invalid:enabled:hover {
+  border-color: var(--bs-form-invalid-border-color);
+}
+.p-inputtext.is-invalid:enabled:focus,
+.was-validated .p-inputtext:invalid:focus {
+  border-color: var(--bs-form-invalid-border-color);
+  box-shadow: 0 0 0 .25rem rgba(var(--bs-danger-rgb),.25);
+}

From 86641ea02d82c84df9d6b4e03e00b4b2456b3fbe Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 2 Sep 2025 16:06:04 +0200
Subject: [PATCH 037/101] StV: Lehrverband- & Special-groups

---
 .../api/frontend/v1/stv/Config.php            |   6 +-
 .../api/frontend/v1/stv/Gruppen.php           | 192 ++++++++++++--
 .../api/frontend/v1/stv/Lehrverband.php       |  63 +++++
 public/js/api/factory/stv/group.js            |  21 ++
 public/js/api/factory/stv/lehrverband.js      |  31 +++
 .../Stv/Studentenverwaltung/Details/Groups.js | 216 ++++++++++++++++
 .../Details/Groups/List.js                    | 171 +++++++++++++
 .../Studentenverwaltung/Details/Groups/Lvb.js | 242 ++++++++++++++++++
 .../Details/Groups/Special.js                 |  97 +++++++
 .../Details/Gruppen/Gruppen.js                | 187 --------------
 system/phrasesupdate.php                      | 161 ++++++++++++
 11 files changed, 1177 insertions(+), 210 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Lehrverband.php
 create mode 100644 public/js/api/factory/stv/lehrverband.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Groups.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Groups/List.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Groups/Lvb.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Groups/Special.js
 delete mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 2fb436384..5898e1094 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -110,7 +110,7 @@ class Config extends FHCAPI_Controller
 		];
 		$result['groups'] = [
 			'title' => $this->p->t('stv', 'tab_groups'),
-			'component' => './Stv/Studentenverwaltung/Details/Gruppen.js'
+			'component' => './Stv/Studentenverwaltung/Details/Groups.js'
 		];
 		$result['messages'] = [
 			'title' => $this->p->t('stv', 'tab_messages'),
@@ -203,6 +203,10 @@ class Config extends FHCAPI_Controller
 				'additionalCols' => []
 			]
 		];
+		$result['groups'] = [
+			'title' => $this->p->t('stv', 'tab_groups'),
+			'component' => './Stv/Studentenverwaltung/Details/Groups.js'
+		];
 		$result['status'] = [
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
diff --git a/application/controllers/api/frontend/v1/stv/Gruppen.php b/application/controllers/api/frontend/v1/stv/Gruppen.php
index c30816f2a..c45165b41 100644
--- a/application/controllers/api/frontend/v1/stv/Gruppen.php
+++ b/application/controllers/api/frontend/v1/stv/Gruppen.php
@@ -9,6 +9,8 @@ class Gruppen extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
+			'add' => ['admin:rw', 'assistenz:rw'],
+			'search' => ['admin:r', 'assistenz:r'],
 			'getGruppen' => ['admin:r', 'assistenz:r'],
 			'deleteGruppe' => ['admin:rw', 'assistenz:rw'],
 		]);
@@ -18,7 +20,9 @@ class Gruppen extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'gruppenmanagement'
+			'ui',
+			'gruppenmanagement',
+			'lehre'
 		]);
 
 		// Load models
@@ -26,15 +30,140 @@ class Gruppen extends FHCAPI_Controller
 		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
 	}
 
+	public function add()
+	{
+		$this->load->library("form_validation");
+
+		$this->form_validation->set_rules(
+			'gruppe_kurzbz',
+			$this->p->t('gruppenmanagement', 'gruppe'),
+			'required|is_in_db[organisation/Gruppe_model]',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired'),
+				'is_in_db' => $this->p->t('ui', 'error_fieldNotFound')
+			]
+		);
+		$this->form_validation->set_rules(
+			'uid',
+			$this->p->t('ui', 'student_uid'),
+			'required|is_in_db[crm/Student_model:student_uid]',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired'),
+				'is_in_db' => $this->p->t('ui', 'error_fieldNotFound')
+			]
+		);
+		$this->form_validation->set_rules(
+			'studiensemester_kurzbz',
+			$this->p->t('lehre', 'studiensemester'),
+			'required|is_in_db[organisation/Studiensemester_model]',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired'),
+				'is_in_db' => $this->p->t('ui', 'error_fieldNotFound')
+			]
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$gruppe_kurzbz = $this->input->post('gruppe_kurzbz');
+		$uid = $this->input->post('uid');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+		$result = $this->BenutzergruppeModel->load([
+			$gruppe_kurzbz,
+			$uid
+		]);
+		$benutzergruppe = $this->getDataOrTerminateWithError($result);
+
+		if ($benutzergruppe) {
+			$this->terminateWithError(
+				$this->p->t('gruppenmanagement', 'error_alreadyInGroup', [
+					'uid' => $uid,
+					'studiensemester_kurzbz' => current($benutzergruppe)->studiensemester_kurzbz
+				]),
+				self::ERROR_TYPE_GENERAL
+			);
+		}
+
+		$result = $this->BenutzergruppeModel->insert([
+			'uid' => $uid,
+			'gruppe_kurzbz' => $gruppe_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		]);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess();
+	}
+
+	public function search()
+	{
+		$query = $this->input->post('query');
+		if (!$query)
+			$this->terminateWithSuccess([]);
+
+		// add query to where clause
+		$query = strtoupper($query);
+		$query = $this->GruppeModel->db->escape_like_str($query);
+		$query = '%' . str_replace(' ', '%', $query) . '%';
+
+		$this->GruppeModel->db->group_start();
+		$this->GruppeModel->db->or_like('UPPER(gruppe_kurzbz)', $query, 'none', false);
+		$this->GruppeModel->db->or_like('UPPER(bezeichnung)', $query, 'none', false);
+		$this->GruppeModel->db->or_like('UPPER(beschreibung)', $query, 'none', false);
+		$this->GruppeModel->db->group_end();
+		
+		// add stg sorting 1
+		$studiengang_kz = $this->input->post('studiengang_kz');
+		$sort_stg = $studiengang_kz ? "WHEN studiengang_kz = " . $this->GruppeModel->escape($studiengang_kz) . " THEN 0" : "";
+
+		// add stg sorting 2
+		$studiengang_kzs = [];
+		$result = $this->permissionlib->getSTG_isEntitledFor('admin');
+		if ($result)
+			$studiengang_kzs = array_merge($studiengang_kzs, $result);
+		$result = $this->permissionlib->getSTG_isEntitledFor('assistenz');
+		if ($result)
+			$studiengang_kzs = array_merge($studiengang_kzs, $result);
+
+		// selects
+		$this->GruppeModel->addSelect("*");
+		$this->GruppeModel->addSelect("CASE
+			" . $sort_stg . "
+			WHEN studiengang_kz IN (" . implode(",", $this->GruppeModel->db->escape($studiengang_kzs)) . ")
+			THEN 1
+			ELSE 2
+		END AS sort_stg");
+
+		// ordering
+		$this->GruppeModel->addOrder("sort_stg");
+		$this->GruppeModel->addOrder("sort");
+		$this->GruppeModel->addOrder("gruppe_kurzbz");
+
+		// default where clause & execute
+		$result = $this->GruppeModel->loadWhere([
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
 	public function getGruppen($student_uid)
 	{
-		$this->BenutzergruppeModel ->addSelect('gruppe_kurzbz');
-		$this->BenutzergruppeModel ->addSelect('bezeichnung');
-		$this->BenutzergruppeModel ->addSelect('generiert');
-		$this->BenutzergruppeModel ->addSelect('uid');
-		$this->BenutzergruppeModel ->addSelect('studiensemester_kurzbz');
-		$this->BenutzergruppeModel ->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
-		$this->BenutzergruppeModel-> addOrder('bezeichnung', 'ASC');
+		$this->BenutzergruppeModel->addSelect('gruppe_kurzbz');
+		$this->BenutzergruppeModel->addSelect('bezeichnung');
+		$this->BenutzergruppeModel->addSelect('generiert');
+		$this->BenutzergruppeModel->addSelect('uid');
+		$this->BenutzergruppeModel->addSelect('studiensemester_kurzbz');
+		$this->BenutzergruppeModel->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
+		$this->BenutzergruppeModel->addOrder('bezeichnung', 'ASC');
 
 		$result = $this->BenutzergruppeModel->loadWhere(
 			array(
@@ -49,29 +178,48 @@ class Gruppen extends FHCAPI_Controller
 
 	public function deleteGruppe()
 	{
-		$student_uid = $this->input->post('id');
+		$this->load->library("form_validation");
+
+		$this->form_validation->set_rules(
+			'uid',
+			$this->p->t('person', 'UID'),
+			'required',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired')
+			]
+		);
+
+		$this->form_validation->set_rules(
+			'gruppe_kurzbz',
+			$this->p->t('gruppenmanagement', 'gruppe'),
+			'required',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired')
+			]
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$uid = $this->input->post('uid');
 		$gruppe_kurzbz = $this->input->post('gruppe_kurzbz');
 
-		//Validate if automatic group generation
-		$result = $this->GruppeModel-> loadWhere(
-			array(
-				'gruppe_kurzbz' => $gruppe_kurzbz
-			)
-		);
+		// Validate if automatic group generation
+		$result = $this->GruppeModel->loadWhere([
+			'gruppe_kurzbz' => $gruppe_kurzbz
+		]);
 		$data = $this->getDataOrTerminateWithError($result);
 		$generation = current($data);
 
-		if($generation->generiert)
+		if ($generation->generiert)
 		{
 			$this->terminateWithError($this->p->t('gruppenmanagement', 'error_deleteGeneratedGroups'), self::ERROR_TYPE_GENERAL);
 		}
 
-		$result = $this->BenutzergruppeModel->delete(
-			array(
-				'gruppe_kurzbz' => $gruppe_kurzbz,
-				'uid' => $student_uid
-				)
-		);
+		$result = $this->BenutzergruppeModel->delete([
+			'gruppe_kurzbz' => $gruppe_kurzbz,
+			'uid' => $uid
+		]);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
diff --git a/application/controllers/api/frontend/v1/stv/Lehrverband.php b/application/controllers/api/frontend/v1/stv/Lehrverband.php
new file mode 100644
index 000000000..72610dd63
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Lehrverband.php
@@ -0,0 +1,63 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+class Lehrverband extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'hasOrgforms' => ['admin:r', 'assistenz:r'],
+			'getTree' => ['admin:r', 'assistenz:r'],
+			'getSpecialgroups' => ['admin:r', 'assistenz:r']
+		]);
+	}
+
+	public function hasOrgforms($studiengang_kz)
+	{
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		
+		$result = $this->StudiengangModel->load($studiengang_kz);
+		
+		$data = $this->getDataOrTerminateWithError($result);
+		if ($data) {
+			$data = current($data)->mischform;
+		}
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getTree($studiengang_kz)
+	{
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+
+		$result = $this->LehrverbandModel->loadWhere([
+			'studiengang_kz' => $studiengang_kz,
+			'aktiv' => true
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getSpecialgroups($studiengang_kz)
+	{
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+
+		$where = [
+			'studiengang_kz' => $studiengang_kz,
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false
+		];
+
+		$result = $this->GruppeModel->loadWhere($where);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/public/js/api/factory/stv/group.js b/public/js/api/factory/stv/group.js
index b395fbf43..18fcb4443 100644
--- a/public/js/api/factory/stv/group.js
+++ b/public/js/api/factory/stv/group.js
@@ -16,6 +16,27 @@
  */
 
 export default {
+	add(uid, gruppe_kurzbz, studiensemester_kurzbz) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/gruppen/add/',
+			params: {
+				uid,
+				gruppe_kurzbz,
+				studiensemester_kurzbz
+			}
+		};
+	},
+	search(query, studiengang_kz) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/gruppen/search/',
+			params: {
+				query,
+				studiengang_kz
+			}
+		};
+	},
 	getGruppen(id) {
 		return {
 			method: 'get',
diff --git a/public/js/api/factory/stv/lehrverband.js b/public/js/api/factory/stv/lehrverband.js
new file mode 100644
index 000000000..676422087
--- /dev/null
+++ b/public/js/api/factory/stv/lehrverband.js
@@ -0,0 +1,31 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	hasOrgforms(studiengang_kz) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/lehrverband/hasOrgforms/' + studiengang_kz
+		};
+	},
+	getTree(studiengang_kz) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/lehrverband/getTree/' + studiengang_kz
+		};
+	}
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Groups.js b/public/js/components/Stv/Studentenverwaltung/Details/Groups.js
new file mode 100644
index 000000000..5b2c6fc73
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Groups.js
@@ -0,0 +1,216 @@
+import GroupsLvb from './Groups/Lvb.js';
+import GroupsSpecial from './Groups/Special.js';
+import GroupsList from './Groups/List.js';
+
+import ApiStvGroups from '../../../../api/factory/stv/group.js';
+import ApiStvDetails from '../../../../api/factory/stv/details.js';
+
+export default {
+	name: 'TabGroups',
+	components: {
+		GroupsLvb,
+		GroupsSpecial,
+		GroupsList
+	},
+	inject: {
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		},
+		currentSemester: {
+			form: 'currentSemester',
+			required: true
+		}
+	},
+	props: {
+		modelValue: [Object, Array]
+	},
+	data() {
+		return {
+			hasOrgforms: false,
+			lvbList: [],
+			specialGroups: [],
+			selectedOrgform: false,
+			selectedSemester: false,
+			selectedVerband: false,
+			selectedGruppe: false,
+			multiFormHandler: (form, errors) => {
+				function _split_errors(result, [uid, errors]) {
+					const gruppe_kurzbz = [];
+					const studiensemester_kurzbz = [];
+					const others = {};
+					errors.forEach(error => {
+						_split_messages(error.messages, gruppe_kurzbz, studiensemester_kurzbz, others);
+					});
+					if (gruppe_kurzbz.length) {
+						if (!result.formFeedback.gruppe_kurzbz)
+							result.formFeedback.gruppe_kurzbz = [];
+						result.formFeedback.gruppe_kurzbz.push(...gruppe_kurzbz);
+					}
+					if (studiensemester_kurzbz.length) {
+						if (!result.formFeedback.studiensemester_kurzbz)
+							result.formFeedback.studiensemester_kurzbz = [];
+						result.formFeedback.studiensemester_kurzbz.push(...studiensemester_kurzbz);
+					}
+					if (Object.keys(others).length) {
+						result.toast[uid] = [
+							{ type: 'validation', messages: others }
+						];
+					}
+					return result;
+				}
+				function _split_messages(messages, gruppe_kurzbz, studiensemester_kurzbz, others) {
+					Object.entries(messages).forEach(([field, msg]) => {
+						if (field == 'gruppe_kurzbz') {
+							gruppe_kurzbz.push(msg);
+						} else if (field == 'studiensemester_kurzbz') {
+							studiensemester_kurzbz.push(msg);
+						} else {
+							if (!others[field])
+								others[field] = [];
+							others[field].push(msg);
+						}
+					});
+				}
+				const { formFeedback, toast } = Object.entries(errors)
+					.reduce(_split_errors, { formFeedback: {}, toast: {} });
+
+				if (formFeedback.gruppe_kurzbz)
+					formFeedback.gruppe_kurzbz = formFeedback.gruppe_kurzbz
+						.filter((v,k,a) => a.indexOf(v) == k);
+				if (formFeedback.studiensemester_kurzbz)
+					formFeedback.studiensemester_kurzbz = formFeedback.studiensemester_kurzbz
+						.filter((v,k,a) => a.indexOf(v) == k);
+
+				form.clearValidation();
+				if (Object.keys(formFeedback)) {
+					form.setFeedback(false, formFeedback);
+				}
+
+				if (Object.keys(toast).length) {
+					console.log(toast);
+					this.$api.getErrorHandler().handler.toast(toast);
+				}
+			}
+		};
+	},
+	computed: {
+		allAreStudents() {
+			if (Array.isArray(this.modelValue))
+				return this.modelValue.every(ps => ps.uid);
+			return this.modelValue.uid;
+		},
+		sharedStg() {
+			if (Array.isArray(this.modelValue)) {
+				const first = this.modelValue.find(Boolean);
+				if (this.modelValue.every(ps => ps.studiengang_kz === first.studiengang_kz))
+					return first.studiengang_kz;
+				return false;
+			}
+			return this.modelValue.studiengang_kz;
+		}
+	},
+	methods: {
+		showNewGroupModal() {
+			this.$refs.newGroupModal.show()
+		},
+		changeLvb(params) {
+			let data = { semester: params.semester };
+			if (params.verband && params.verband != " ") {
+				data.verband = params.verband;
+				if (params.gruppe && params.gruppe != " ")
+					data.gruppe = params.gruppe;
+			}
+
+			let endpoint;
+
+			if (Array.isArray(this.modelValue)) {
+				endpoint = this.modelValue.map(student => [
+					student.uid + ' (' + student.vorname + ' ' + student.nachname + ')',
+					ApiStvDetails.save(
+						student.prestudent_id,
+						this.currentSemester,
+						data
+					)
+				]);
+			} else {
+				endpoint = ApiStvDetails.save(
+					this.modelValue.prestudent_id,
+					this.currentSemester,
+					data
+				);
+			}
+			this.$api
+				.call(endpoint)
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$reloadList();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		addSpecialGroup(params) {
+			const gruppe_kurzbz = this.$refs.newGroupModal.value.gruppe_kurzbz || this.$refs.newGroupModal.value;
+
+			if (Array.isArray(this.modelValue)) {
+				this.$refs.newGroupModal.$refs.form
+					.call(
+						this.modelValue.map(student => [
+							student.uid + ' (' + student.vorname + ' ' + student.nachname + ')',
+							ApiStvGroups.add(
+								student.uid,
+								gruppe_kurzbz,
+								this.currentSemester
+							)
+						]),
+						{
+							errorHandling: {
+								combine: { form: ['validation'] },
+								handler: { form: this.multiFormHandler }
+							}
+						}
+					)
+					.then(result => {
+						const successes = result.filter(res => res.status == 'fulfilled');
+						if (result.length == successes.length) {
+							this.$refs.newGroupModal.hide();
+						}
+						if (successes.length) {
+							this.$fhcAlert.alertSuccess(this.$p.t('gruppenmanagement/groups_added', { n: successes.length }));
+							this.$refs.list.reload();
+						}
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			} else {
+				this.$refs.newGroupModal.$refs.form
+					.call(ApiStvGroups.add(this.modelValue.uid, gruppe_kurzbz, this.currentSemester))
+					.then(result => {
+						this.$refs.newGroupModal.hide();
+						this.$fhcAlert.alertSuccess(this.$p.t('gruppenmanagement/groups_added', { n: 1 }));
+						this.$refs.list.reload();
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			}
+		}
+	},
+	template: /* html */`
+	<div class="stv-details-groups h-100 d-flex flex-column">
+		<h3>{{ $p.t('gruppenmanagement/special_groups') }}</h3>
+		<groups-special
+			ref="newGroupModal"
+			:default-stg="sharedStg"
+			@submit.capture.prevent="addSpecialGroup"
+		/>
+		<groups-list
+			ref="list"
+			class="mb-3"
+			:students="modelValue"
+			@new="showNewGroupModal"
+		/>
+
+		<h3>{{ $p.t('lehre/lehrverband') }}</h3>
+		<groups-lvb
+			:students="modelValue"
+			@submit="changeLvb"
+		/>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Groups/List.js b/public/js/components/Stv/Studentenverwaltung/Details/Groups/List.js
new file mode 100644
index 000000000..bc4b5a86a
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Groups/List.js
@@ -0,0 +1,171 @@
+import { CoreFilterCmpt } from "../../../../filter/Filter.js";
+
+import ApiStvGroups from '../../../../../api/factory/stv/group.js';
+
+export default {
+	name: 'TabGroupsList',
+	components: {
+		CoreFilterCmpt
+	},
+	inject: [
+		"currentSemester"
+	],
+	props: {
+		students: Object
+	},
+	emits: [
+		"new"
+	],
+	data() {
+		return {
+			phrasenLoaded: false,
+			optionsReady: true
+		};
+	},
+	computed: {
+		tabulatorOptions() {
+			let ajaxRequestFunc, ajaxResponse, initialFilter;
+			if (Array.isArray(this.students)) {
+				ajaxRequestFunc = () => {
+					return this.$api.call(
+						this.students.map(student => ApiStvGroups.getGruppen(student.uid))
+					);
+				};
+				ajaxResponse = (url, params, response) => {
+					return response.reduce((data, result) => [
+						...data,
+						...result.value.data
+					], []);
+				};
+				initialFilter = [
+					this.students.map(student => {
+						return { field: "uid", type: "=", value: student.uid };
+					}),
+					[
+						{ field: "studiensemester_kurzbz", type: "=", value: null },
+						{ field: "studiensemester_kurzbz", type: "=", value: this.currentSemester }
+					]
+				];
+			} else {
+				ajaxRequestFunc = () => {
+					return this.$api.call(
+						ApiStvGroups.getGruppen(this.students.uid)
+					);
+				};
+				ajaxResponse = (url, params, response) => {
+					return response.data;
+				};
+				initialFilter = [
+					{ field: "uid", type: "=", value: this.students.uid },
+					[
+						{ field: "studiensemester_kurzbz", type: "=", value: null },
+						{ field: "studiensemester_kurzbz", type: "=", value: this.currentSemester }
+					]
+				];
+			}
+			return {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc,
+				ajaxResponse,
+				initialFilter,
+				columns: [
+					{ title: this.$p.t('gruppenmanagement/gruppe'), field: "gruppe_kurzbz" },
+					{ title: this.$p.t('ui/bezeichnung'), field: "bezeichnung" },
+					{ title: this.$p.t('lehre/studiensemester'), field: "studiensemester_kurzbz" },
+					{
+						title: this.$p.t('gruppenmanagement/automatisch_generiert'),
+						field: "generiert",
+						formatter: "tickCross",
+						hozAlign: "center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{ title: this.$p.t('ui/student_uid'), field: "uid" },
+					{
+						title: this.$p.t('global/actions'),
+						field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							const container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							const data = cell.getData();
+
+							const button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = this.$p.t('ui', 'loeschen');
+							button.addEventListener('click', () =>
+								this.actionDeleteGroup(data)
+							);
+							if (data.generiert)
+								button.disabled = true;
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}
+				],
+				height: 'auto',
+				index: 'group_id',
+				persistenceID: 'stv-details-group-list'
+			};
+		}
+	},
+	watch: {
+		tabulatorOptions() {
+			// Refresh Tabulator if options have changed
+			this.optionsReady = false;
+			this.$nextTick(() => this.optionsReady = true);
+		}
+	},
+	methods: {
+		actionDeleteGroup(data) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? data
+					: Promise.reject({handled: true}))
+				.then(this.deleteGroup)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteGroup(params) {
+			return this.$api
+				.call(ApiStvGroups.deleteGroup(params))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					this.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	mounted() {
+		this.$p
+			.loadCategory(['global', 'lehre', 'ui', 'gruppenmanagement'])
+			.then(() => {
+				this.phrasenLoaded = true;
+			});
+	},
+	template: /* html */`
+	<div class="stv-details-groups-list">
+		<core-filter-cmpt
+			v-if="phrasenLoaded && optionsReady"
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			table-only
+			:side-menu="false"
+			reload
+			:reload-btn-infotext="$p.t('table/reload')"
+			new-btn-show
+			:new-btn-label="$p.t('lehre/gruppe')"
+			@click:new="$emit('new')"
+		>
+		</core-filter-cmpt>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Groups/Lvb.js b/public/js/components/Stv/Studentenverwaltung/Details/Groups/Lvb.js
new file mode 100644
index 000000000..db94d359c
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Groups/Lvb.js
@@ -0,0 +1,242 @@
+import FhcForm from "../../../../Form/Form.js";
+
+import ApiStvLvb from '../../../../../api/factory/stv/lehrverband.js';
+
+export default {
+	name: 'TabGroupsLvb',
+	components: {
+		FhcForm
+	},
+	props: {
+		students: Object
+	},
+	emits: [
+		"submit"
+	],
+	data() {
+		return {
+			lvbList: [],
+			selectedSemester: false,
+			selectedVerband: false,
+			selectedGruppe: false
+		};
+	},
+	computed: {
+		allAreStudents() {
+			if (Array.isArray(this.students))
+				return this.students.every(ps => ps.uid);
+			return this.students.uid;
+		},
+		studiengang_kz() {
+			if (Array.isArray(this.students)) {
+				const first = this.students.find(Boolean);
+				if (this.students.every(ps => ps.studiengang_kz === first.studiengang_kz))
+					return first.studiengang_kz;
+				return false;
+			}
+			return this.students.studiengang_kz;
+		},
+		semester: {
+			get() {
+				if (this.selectedSemester !== false) {
+					if (this.lvbList.some(item => item.semester == this.selectedSemester))
+						return this.selectedSemester;
+					return false;
+				}
+				if (Array.isArray(this.students)) {
+					const first = this.students.find(Boolean);
+					if (this.lvbList.every(item => item.semester != first.semester))
+						return false;
+					if (this.students.every(ps => ps.semester === first.semester))
+						return first.semester;
+					return false;
+				}
+				if (this.lvbList.some(item => item.semester == this.students.semester))
+					return this.students.semester;
+				return false;
+			},
+			set(value) {
+				this.selectedSemester = value;
+			}
+		},
+		verband: {
+			get() {
+				if (this.semester === false)
+					return false;
+				if (this.selectedVerband !== false) {
+					if (this.lvbListVerband.some(item => item.verband == this.selectedVerband))
+						return this.selectedVerband;
+					return false;
+				}
+				if (Array.isArray(this.students)) {
+					const first = this.students.find(Boolean);
+					if (this.lvbListVerband.every(item => item.verband != first.verband))
+						return false;
+					if (this.students.every(ps => ps.verband === first.verband))
+						return first.verband;
+					return false;
+				}
+				if (this.lvbListVerband.some(item => item.verband == this.students.verband))
+					return this.students.verband;
+				return false;
+			},
+			set(value) {
+				this.selectedVerband = value;
+			}
+		},
+		gruppe: {
+			get() {
+				if (this.verband === false)
+					return false;
+				if (this.selectedGruppe !== false) {
+					if (this.lvbListGruppe.some(item => item.gruppe == this.selectedGruppe))
+						return this.selectedGruppe;
+					return false;
+				}
+				if (Array.isArray(this.students)) {
+					const first = this.students.find(Boolean);
+					if (this.lvbListGruppe.every(item => item.gruppe != first.gruppe))
+						return false;
+					if (this.students.every(ps => ps.gruppe === first.gruppe))
+						return first.gruppe;
+					return false;
+				}
+				if (this.lvbListGruppe.some(item => item.gruppe == this.students.gruppe))
+					return this.students.gruppe;
+				return false;
+			},
+			set(value) {
+				this.selectedGruppe = value;
+			}
+		},
+		stgSemester() {
+			if (!this.lvbList.length)
+				return [];
+
+			const semester = new Set(this.lvbList.map(lvb => lvb.semester));
+
+			return Array.from(semester).sort((a, b) => a - b);
+		},
+		lvbListVerband() {
+			if (!this.lvbList.length)
+				return [];
+			if (this.semester === false)
+				return [];
+
+			return this.lvbList.filter(lvb => this.semester == lvb.semester);
+		},
+		semesterVerband() {
+			if (!this.lvbListVerband.length)
+				return [];
+
+			const verband = new Set(this.lvbListVerband.map(lvb => lvb.verband.replace(/ /g, '')));
+
+			return Array.from(verband).filter(Boolean).sort();
+		},
+		lvbListGruppe() {
+			if (!this.lvbListVerband.length)
+				return [];
+			if (this.verband === false)
+				return [];
+
+			return this.lvbListVerband.filter(lvb => this.verband == lvb.verband);
+		},
+		verbandGruppe() {
+			if (!this.lvbListGruppe.length)
+				return [];
+
+			const gruppe = new Set(this.lvbListGruppe.map(lvb => lvb.gruppe.replace(/ /g, '')));
+
+			return Array.from(gruppe).filter(Boolean).sort();
+		}
+	},
+	watch: {
+		studiengang_kz() {
+			this.loadGroupsForStg();
+		}
+	},
+	methods: {
+		loadGroupsForStg() {
+			this.lvbList = [];
+
+			if (this.studiengang_kz === false)
+				return;
+
+			let lvbList;
+			this.$api
+				.call(ApiStvLvb.getTree(this.studiengang_kz))
+				.then(result => this.lvbList = result.data)
+				.catch(this.$fhcAlert.handleSystemError)
+		},
+		onSubmit() {
+			let params = {
+				studiengang_kz: this.studiengang_kz,
+				semester: this.semester,
+				verband: this.verband,
+				gruppe: this.gruppe
+			};
+			this.$emit("submit", params);
+		}
+	},
+	created() {
+		this.loadGroupsForStg();
+	},
+	template: /* html */`
+	<div class="stv-details-groups-lvb">
+		<fhc-form
+			v-if="allAreStudents && studiengang_kz"
+			ref="form"
+			class="input-group"
+			@submit.prevent="onSubmit"
+		>
+			<span class="input-group-text">
+				{{ $p.t('lehre/semester') }}
+			</span>
+			<select
+				v-model="semester"
+				class="form-select"
+			>
+				<option v-for="semester in stgSemester">{{ semester }}</option>
+			</select>
+			<span
+				class="input-group-text"
+				:class="{'text-muted': semester === false}"
+			>
+				{{ $p.t('lehre/verband') }}
+			</span>
+			<select
+				v-model="verband"
+				class="form-select"
+				:disabled="semester === false"
+			>
+				<option v-for="verband in semesterVerband">{{ verband }}</option>
+			</select>
+			<span
+				class="input-group-text"
+				:class="{'text-muted': verband === false}"
+			>
+				{{ $p.t('lehre/gruppe') }}
+			</span>
+			<select
+				v-model="gruppe"
+				class="form-select"
+				:disabled="verband === false"
+			>
+				<option v-for="gruppe in verbandGruppe">{{ gruppe }}</option>
+			</select>
+			<button
+				type="submit"
+				class="btn btn-primary"
+				:disabled="gruppe === false && verband === false"
+			>
+				{{ $p.t('ui/change') }}
+			</button>
+		</fhc-form>
+		<div v-if="!allAreStudents" class="alert alert-danger">
+			{{ $p.t('stv/groups_error_notallstudents') }}
+		</div>
+		<div v-if="!studiengang_kz" class="alert alert-danger">
+			{{ $p.t('stv/groups_error_notsamestg') }}
+		</div>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Groups/Special.js b/public/js/components/Stv/Studentenverwaltung/Details/Groups/Special.js
new file mode 100644
index 000000000..90b4c15ec
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Groups/Special.js
@@ -0,0 +1,97 @@
+import BsModal from "../../../../Bootstrap/Modal.js";
+import FhcForm from "../../../../Form/Form.js";
+import FormValidation from "../../../../Form/Validation.js";
+import FormInput from "../../../../Form/Input.js";
+
+import ApiStvGroups from '../../../../../api/factory/stv/group.js';
+
+export default {
+	name: 'TabGroupsSpecial',
+	components: {
+		BsModal,
+		FhcForm,
+		FormValidation,
+		FormInput,
+		PvAutocomplete: primevue.autocomplete
+	},
+	props: {
+		defaultStg: Number
+	},
+	emits: [
+		"chosen"
+	],
+	data() {
+		return {
+			value: '',
+			groupSuggestions: []
+		};
+	},
+	methods: {
+		show() {
+			this.$refs.popup.show();
+		},
+		hide() {
+			this.$refs.popup.hide();
+		},
+		getGroupSuggestions({ query }) {
+			this.$api
+				.call(ApiStvGroups.search(query, this.defaultStg))
+				.then(result => this.groupSuggestions = result.data)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		onSubmit(evt) {
+			if (!evt.defaultPrevented) {
+				evt.preventDefault();
+				this.hide();
+			}
+		},
+		onEnter(evt) {
+			/**
+			 * NOTE(chris): PrimeVue: AutoComplete: Enter does not submit form #5618
+			 * @see https://github.com/primefaces/primevue/issues/5618
+			 *
+			 * this is fixed in 3.52.0
+			 * until then this function fill fix it
+			 */
+			if (!this.$refs.autocomplete.$refs.input.overlayVisible) {
+				this.$refs.form.$el.requestSubmit();
+			}
+		},
+		modalOpened() {
+			this.$refs.autocomplete.$refs.input.$refs.focusInput.focus();
+		},
+		modalClosed() {
+			this.value = '';
+			this.$refs.form.clearValidation();
+		}
+	},
+	template: /* html */`
+	<bs-modal
+		ref="popup"
+		class="stv-details-groups-special"
+		@hide-bs-modal="modalClosed"
+		@shown-bs-modal="modalOpened"
+	>
+		<template #title>
+			{{ $p.t('gruppenmanagement/add_group') }}
+		</template>
+		<fhc-form ref="form" @submit="onSubmit">
+			<form-validation />
+			<div class="input-group">
+				<form-input
+					ref="autocomplete"
+					type="autocomplete"
+					name="gruppe_kurzbz"
+					v-model="value"
+					container-class="flex-grow-1"
+					input-class="w-100"
+					:suggestions="groupSuggestions"
+					:option-label="el => el.gruppe_kurzbz + (el.bezeichnung ? ' (' + el.bezeichnung + ')' : '')"
+					@complete="getGroupSuggestions"
+					@keydown.enter.capture="onEnter"
+				/>
+				<button type="submit" class="btn btn-primary">{{ $p.t('ui/hinzufuegen') }}</button>
+			</div>
+		</fhc-form>
+	</bs-modal>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
deleted file mode 100644
index ab0c8d8e4..000000000
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ /dev/null
@@ -1,187 +0,0 @@
-import {CoreFilterCmpt} from "../../../../filter/Filter.js";
-
-import ApiStvGroups from '../../../../../api/factory/stv/group.js';
-
-export default {
-	name: 'TblGroups',
-	components: {
-		CoreFilterCmpt,
-	},
-	inject: {
-		currentSemester: {
-			from: 'currentSemester',
-		},
-	},
-	props: {
-		student: Object
-	},
-	data() {
-		return {
-			tabulatorOptions: {
-				ajaxURL: 'dummy',
-				ajaxRequestFunc: () => this.$api.call(
-					ApiStvGroups.getGruppen(this.student.uid)
-				),
-				ajaxResponse: (url, params, response) => response.data,
-				initialFilter: {
-					logic: "and",
-					filters: [
-						{ field: "uid", operator: "eq", value: this.student.uid },
-						{
-							logic: "or",
-							filters: [
-								{ field: "studiensemester_kurzbz", operator: "eq", value: null },
-								{ field: "studiensemester_kurzbz", operator: "eq", value: this.currentSemester }
-							]
-						}
-					]
-				},
-				columns: [
-					{title: "Gruppe", field: "gruppe_kurzbz"},
-					{title: "Bezeichnung", field: "bezeichnung"},
-					{title: "Semester", field: "studiensemester_kurzbz"},
-					{
-						title: "automatisch generiert",
-						field: "generiert",
-						formatter: "tickCross",
-						hozAlign: "center",
-						formatterParams: {
-							tickElement: '<i class="fa fa-check text-success"></i>',
-							crossElement: '<i class="fa fa-xmark text-danger"></i>'
-						}
-					},
-					{title: "UID", field: "uid"},
-					{
-						title: 'Aktionen', field: 'actions',
-						minWidth: 150, // Ensures Action-buttons will be always fully displayed
-						formatter: (cell, formatterParams, onRendered) => {
-							const container = document.createElement('div');
-							container.className = "d-flex gap-2";
-
-							const data = cell.getData();
-
-							const button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-xmark"></i>';
-							button.title = this.$p.t('ui', 'loeschen');
-							button.addEventListener('click', () =>
-								this.actionDeleteGroup(data.gruppe_kurzbz)
-							);
-							if (data.generiert)
-								button.disabled = true;
-							container.append(button);
-
-							return container;
-						},
-						frozen: true
-					},
-				],
-				layout: 'fitDataFill',
-				height: 'auto',
-				index: 'group_id',
-				persistenceID: 'stv-details-gruppe'
-			},
-			tabulatorEvents: [
-				{
-					event: 'tableBuilt',
-					handler: async () => {
-
-						await this.$p.loadCategory(['global', 'person', 'stv', 'ui', 'gruppenmanagement']);
-
-						let cm = this.$refs.table.tabulator.columnManager;
-
-						cm.getColumnByField('gruppe_kurzbz').component.updateDefinition({
-							title: this.$p.t('gruppenmanagement', 'gruppe')
-						});
-
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('ui', 'bezeichnung')
-						});
-
-						cm.getColumnByField('generiert').component.updateDefinition({
-							title: this.$p.t('gruppenmanagement', 'automatisch_generiert')
-						});
-
-						cm.getColumnByField('uid').component.updateDefinition({
-							title: this.$p.t('ui', 'student_uid')
-						});
-
-						//Interference with Filter if not commented out
-						/*
-						cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
-							title: this.$p.t('lehre', 'studiensemester')
-						});*/
-
-					}
-				}
-			],
-		}
-	},
-	methods: {
-		actionDeleteGroup(gruppe_kurzbz) {
-			this.$fhcAlert
-				.confirmDelete()
-				.then(result => result
-					? gruppe_kurzbz
-					: Promise.reject({handled: true}))
-				.then(this.deleteGroup)
-				.catch(this.$fhcAlert.handleSystemError);
-
-		},
-		deleteGroup(gruppe_kurzbz) {
-			const group_id = {
-				id: this.student.uid,
-				gruppe_kurzbz: gruppe_kurzbz
-			};
-
-			return this.$api
-				.call(ApiStvGroups.deleteGroup(group_id))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					window.scrollTo(0, 0);
-					this.reload();
-				});
-		},
-		reload() {
-			this.$refs.table.reloadTable();
-		},
-	},
-	watch: {
-		currentSemester(newVal) {
-			if (newVal) {
-				this.$refs.table.tabulator.clearFilter(); // Clear old filters
-
-				this.$refs.table.tabulator.setFilter((data) => {
-					return (
-						data.uid === this.student.uid &&
-						(
-							data.studiensemester_kurzbz === newVal ||
-							data.studiensemester_kurzbz === null
-						)
-					);
-				});
-			}
-		},
-		student() {
-			this.$refs.table.reloadTable();
-		}
-	},
-	template: `
-				<div class="stv-details-gruppen h-100 pb-3">
-					<h5>{{$p.t('stv', 'tab_groups')}}</h5>
-
-					<core-filter-cmpt
-						ref="table"
-						:tabulator-options="tabulatorOptions"
-						:tabulator-events="tabulatorEvents"
-						table-only
-						:side-menu="false"
-						reload
-						:reload-btn-infotext="this.$p.t('table', 'reload')"
-					>
-					</core-filter-cmpt>
-				</div>
-			`
-}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 82ea03ba0..61fa4ef04 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1515,6 +1515,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'change',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ändern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Change',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -25371,6 +25391,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldNotFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{field} nicht gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{field} not found',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'notiz',
@@ -39164,6 +39204,47 @@ array(
 			)
 		)
 	),
+	// groups
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'groups_error_notallstudents',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler: Es können nur Studierende mit UID verschoben werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: Only students with UID can be moved.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'groups_error_notsamestg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler: Alle Studierenden müssen im selben Studiengang sein.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: All students must be in the same program.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 	//****************************	 CORE/document_export
 	array(
@@ -43097,6 +43178,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'special_groups',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Spezialgruppen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Special groups',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'add_group',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppe hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add group',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'groups_added',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{n} Gruppen hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Added {n} groups',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'gruppenmanagement',
@@ -43137,6 +43278,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'error_alreadyInGroup',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Student {uid} ist bereits im {studiensemester_kurzbz} dieser Gruppe zugeteilt. Entfernen Sie vorher diese Zuteilung.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student {uid} is already assigned to this group in {studiensemester_kurzbz}. Remove this assignment beforehand.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//////////// FHC4 Phrases Gruppen End ////////////
 
 array(

From 61cfb175e3247976fc671df56f43ee9c72332f8a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 3 Sep 2025 11:06:09 +0200
Subject: [PATCH 038/101] use undefined to avoid VueJs warning

---
 public/js/components/Stv/Studentenverwaltung/Details/Groups.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Groups.js b/public/js/components/Stv/Studentenverwaltung/Details/Groups.js
index 5b2c6fc73..fab9511fe 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Groups.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Groups.js
@@ -105,7 +105,7 @@ export default {
 				const first = this.modelValue.find(Boolean);
 				if (this.modelValue.every(ps => ps.studiengang_kz === first.studiengang_kz))
 					return first.studiengang_kz;
-				return false;
+				return undefined;
 			}
 			return this.modelValue.studiengang_kz;
 		}

From ff061a3e9591ad57b994ff750aefda6eee93a686 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 5 Sep 2025 14:04:41 +0200
Subject: [PATCH 039/101] FhcAPI: expose getConfig function

---
 public/js/plugins/Api.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index 0b8e2fd17..6b9627698 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -546,6 +546,9 @@ export default {
 				} else {
 					console.error("FhcApi: method not allowed:", method);
 				}
+			},
+			getErrorHandler(config) {
+				return get_error_handler(config);
 			}
 		};
 

From 455698b28e87366a365be0c33b22af53dfefa7f4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 10 Sep 2025 11:18:23 +0200
Subject: [PATCH 040/101] StV Groups Drag&Drop

---
 .../api/frontend/v1/stv/Student.php           |  26 ++
 .../api/frontend/v1/stv/Verband.php           |   3 +
 public/js/api/factory/stv/details.js          |  10 +
 .../components/Calendar/Base/DragAndDrop.js   |   7 +-
 .../Stv/Studentenverwaltung/List.js           |  83 ++++-
 .../Stv/Studentenverwaltung/Verband.js        |  78 +++-
 public/js/directives/dragClick.js             | 101 ++++++
 public/js/directives/draggable.js             |  97 +++++
 public/js/directives/drop.js                  |  57 +++
 public/js/helpers/DragAndDrop.js              | 342 +++++++++++++++---
 public/js/sharedworkers/dragend.js            |  30 ++
 11 files changed, 758 insertions(+), 76 deletions(-)
 create mode 100644 public/js/directives/dragClick.js
 create mode 100644 public/js/directives/draggable.js
 create mode 100644 public/js/directives/drop.js
 create mode 100644 public/js/sharedworkers/dragend.js

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 0cfd82c36..5cff2b173 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -36,6 +36,7 @@ class Student extends FHCAPI_Controller
 		parent::__construct([
 			'get' => ['admin:r', 'assistenz:r'],
 			'save' => ['admin:rw', 'assistenz:rw'],
+			'saveStudent' => ['admin:rw', 'assistenz:rw'],
 			'check' => ['admin:rw', 'assistenz:rw'],
 			'add' => ['admin:rw', 'assistenz:rw'] // TODO(chris): extra permissions
 		]);
@@ -414,6 +415,31 @@ class Student extends FHCAPI_Controller
 		), ''));
 	}
 
+	/**
+	 * Saves data to a prestudent using their student_uid
+	 *
+	 * @param string			$student_uid
+	 * @param string			$studiensemester_kurzbz
+	 * @return void
+	 */
+	public function saveStudent($student_uid, $studiensemester_kurzbz)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+
+		$result = $this->StudentModel->load([$student_uid]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if (!$data)
+			show_404(); // No Student with that ID
+
+		$student = current($data);
+
+		$this->checkPermissionsForPrestudent($student->prestudent_id, ['admin:rw', 'assistenz:rw']);
+
+		return $this->save($student->prestudent_id, $studiensemester_kurzbz);
+	}
+
 	public function check()
 	{
 		$this->load->library('form_validation');
diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 4060704de..4ff2c74fe 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -271,6 +271,7 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband ORDER BY gruppe LIMIT 1)) AS name", false);
 		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
 
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($semester) . ' AS semester');
 		$this->StudiengangModel->addSelect('verband');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 		
@@ -319,6 +320,8 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, gruppe, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband AND gruppe=v.gruppe ORDER BY gruppe LIMIT 1)) AS name", false);
 		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
 
+		$this->StudiengangModel->addSelect('v.semester');
+		$this->StudiengangModel->addSelect('v.verband');
 		$this->StudiengangModel->addSelect('gruppe');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 		
diff --git a/public/js/api/factory/stv/details.js b/public/js/api/factory/stv/details.js
index 1077de22d..577bc14fb 100644
--- a/public/js/api/factory/stv/details.js
+++ b/public/js/api/factory/stv/details.js
@@ -35,4 +35,14 @@ export default {
 			params
 		};
 	},
+	saveStudent(student_uid, studiensemester_kurzbz, params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/student/saveStudent/'
+				+ encodeURIComponent(student_uid)
+				+ '/'
+				+ encodeURIComponent(studiensemester_kurzbz),
+			params
+		};
+	}
 };
\ No newline at end of file
diff --git a/public/js/components/Calendar/Base/DragAndDrop.js b/public/js/components/Calendar/Base/DragAndDrop.js
index 0be17ddb4..631a792a8 100644
--- a/public/js/components/Calendar/Base/DragAndDrop.js
+++ b/public/js/components/Calendar/Base/DragAndDrop.js
@@ -96,8 +96,11 @@ export default {
 	},
 	methods: {
 		onDragstart(evt) {
-			DragAndDrop.setTransferData(evt.detail.originalEvent, evt.detail.item.orig);
-			this.draggedInternalEvent = evt.detail.item;
+			const data = DragAndDrop.convertToTransferData(evt.detail.item.orig);
+			if (DragAndDrop.isValidDragObject(data)) {
+				DragAndDrop.setTransferData(evt.detail.originalEvent, data);
+				this.draggedInternalEvent = evt.detail.item;
+			}
 		},
 		onDragend() {
 			this.draggedInternalEvent = null;
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 67cada523..9e4cd4296 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -1,6 +1,7 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import ListNew from './List/New.js';
 
+import draggable from '../../../directives/draggable.js';
 
 export default {
 	name: "ListPrestudents",
@@ -8,11 +9,18 @@ export default {
 		CoreFilterCmpt,
 		ListNew
 	},
+	directives: {
+		draggable
+	},
 	inject: {
-		'lists': {
+		lists: {
 			from: 'lists',
 			required: true
 		},
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		},
 		currentSemester: {
 			from: 'currentSemester',
 			required: true
@@ -165,6 +173,39 @@ export default {
 			currentEndpointRawUrl: ''
 		}
 	},
+	computed: {
+		countsToHTML: function() {
+			return this.$p.t('global/ausgewaehlt')
+				+ ': <strong>' + (this.selectedcount || 0) + '</strong>'
+				+ ' | '
+				+ this.$p.t('global/gefiltert')
+				+ ': '
+				+ '<strong>' + (this.filteredcount || 0) + '</strong>'
+				+ ' | '
+				+ this.$p.t('global/gesamt')
+				+ ': <strong>' + (this.count || 0) + '</strong>';
+		},
+		selectedDragObject() {
+			return this.selected.map(item => {
+				let type, id;
+				if (item.uid) {
+					type = 'student';
+					id = item.uid;
+				} else if (item.prestudent_id) {
+					type = 'prestudent';
+					id = item.prestudent_id;
+				} else if (item.person_id) {
+					type = 'person';
+					id = item.person_id;
+				}
+				return {
+					...item,
+					type,
+					id
+				};
+			});
+		}
+	},
 	methods: {
 		reload() {
 			this.$refs.table.reloadTable();
@@ -172,10 +213,19 @@ export default {
 		actionNewPrestudent() {
 			this.$refs.new.open();
 		},
-		rowSelectionChanged(data) {
+		rowSelectionChanged(data, rows) {
 			this.selectedcount = data.length;
 			this.lastSelected = this.selected;
 			this.$emit('update:selected', data);
+
+			// set selected elements draggable
+			const tableEl = this.$refs.table?.$refs?.table;
+			if (tableEl) {
+				const oldDragables = tableEl.querySelectorAll('[draggable]');
+				for (const draggable of oldDragables)
+					draggable.removeAttribute('draggable');
+			}
+			rows.forEach(row => row.getElement().draggable = true);
 		},
 		autoSelectRows(data) {
 			if (this.lastSelected) {
@@ -294,26 +344,27 @@ export default {
 				if (el != this.focusObj)
 					this.changeFocus(this.focusObj, el);
 			}
-		}
-	},
-	computed: {
-		countsToHTML: function() {
-			return this.$p.t('global/ausgewaehlt')
-				+ ': <strong>' + (this.selectedcount || 0) + '</strong>'
-				+ ' | '
-				+ this.$p.t('global/gefiltert')
-				+ ': '
-				+ '<strong>' + (this.filteredcount || 0) + '</strong>'
-				+ ' | '
-				+ this.$p.t('global/gesamt')
-				+ ': <strong>' + (this.count || 0) + '</strong>';
+		},
+		dragCleanup(evt) {
+			if (evt.dataTransfer.dropEffect == 'none')
+				return; // aborted or wrong target
+			
+			this.$reloadList();
 		}
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
 	// TODO(chris): filter component column chooser has no accessibilty features
 	template: `
 	<div class="stv-list h-100 pt-3">
-		<div class="tabulator-container d-flex flex-column h-100" :class="{'has-filter': filterKontoCount0 || filterKontoMissingCounter}" tabindex="0" @focusin="onFocus" @keydown="onKeydown">
+		<div
+			class="tabulator-container d-flex flex-column h-100"
+			:class="{'has-filter': filterKontoCount0 || filterKontoMissingCounter}"
+			tabindex="0"
+			@focusin="onFocus"
+			@keydown="onKeydown"
+			v-draggable:copyLink.capture="selectedDragObject"
+			@dragend="dragCleanup"
+		>
 			<core-filter-cmpt
 				ref="table"
 				:description="countsToHTML"
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 9a34033ce..cfa7f0aed 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -1,10 +1,28 @@
-import ApiStvVerband from '../../../api/factory/stv/verband.js';
+import drop from '../../../directives/drop.js';
+import dragClick from '../../../directives/dragClick.js';
+
+import ApiStvGroups from '../../../api/factory/stv/group.js';
+import ApiStvDetails from '../../../api/factory/stv/details.js';
 
 export default {
 	components: {
 		PvTreetable: primevue.treetable,
 		PvColumn: primevue.column
 	},
+	directives: {
+		drop,
+		dragClick
+	},
+	inject: {
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	emits: [
 		'selectVerband'
 	],
@@ -207,6 +225,51 @@ export default {
 
 			this.selectedKey = {[currentNode.key]: true};
 			this.onSelectTreeNode(currentNode);
+		},
+		async toggleTreeNode(node) {
+			if (this.expandedKeys[node.key]) {
+				delete this.expandedKeys[node.key];
+			} else if (!node.leaf) {
+				await this.onExpandTreeNode(node);
+				this.expandedKeys[node.key] = true;
+			}
+		},
+		getStudentAjaxId(student) {
+			let res = student.id;
+			if (student.vorname && student.nachname)
+				res += ' (' + student.vorname + ' ' + student.nachname + ')';
+			return res;
+		},
+		dropStudents(node, students, evt) {
+			const data = node.data;
+			
+			let endpoint;
+			if (data.gruppe_kurzbz) {
+				endpoint = students.map(student => [
+					this.getStudentAjaxId(student),
+					ApiStvGroups.add(
+						student.id,
+						data.gruppe_kurzbz,
+						this.currentSemester
+					)
+				]);
+			} else {
+				const { semester, verband, gruppe } = data;
+				const params = { semester, verband, gruppe };
+				endpoint = students.map(student => [
+					this.getStudentAjaxId(student),
+					ApiStvDetails.saveStudent(
+						student.id,
+						this.currentSemester,
+						params
+					)
+				]);
+			}
+
+			return this.$api
+				.call(endpoint)
+				.then(this.$reloadList)
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	mounted() {
@@ -268,10 +331,21 @@ export default {
 				</template>
 				<template #body="{ node }">
 					<span
+						v-if="['semester', 'verband', 'gruppe', 'gruppe_kurzbz'].some(key => node.data.hasOwnProperty(key))"
 						:data-tree-item-key="node.key"
 						:title="node.data.studiengang_kz"
+						v-drag-click="() => toggleTreeNode(node)"
+						v-drop:link-strict.student-collection="(evt, students) => dropStudents(node, students, evt)"
 					>
-						{{node.data.name}}
+						{{ node.data.name }}
+					</span>
+					<span
+						v-else
+						:data-tree-item-key="node.key"
+						:title="node.data.studiengang_kz"
+						v-drag-click="() => toggleTreeNode(node)"
+					>
+						{{ node.data.name }}
 					</span>
 				</template>
 			</pv-column>
diff --git a/public/js/directives/dragClick.js b/public/js/directives/dragClick.js
new file mode 100644
index 000000000..aeeafb818
--- /dev/null
+++ b/public/js/directives/dragClick.js
@@ -0,0 +1,101 @@
+export default {
+	mounted(el, binding) {
+		const delay = parseInt(binding.arg) || 300;
+
+		let timeout = null;
+		function startCountdown() {
+			timeout = window.setTimeout(binding.value, delay);
+		}
+		function stopCountdown() {
+			if (timeout)
+				window.clearTimeout(timeout);
+			timeout = null;
+		}
+
+		function onEnter(evt) {
+			let lastTarget = evt.target;
+			let lastX = evt.offsetX;
+			let lastY = evt.offsetY;
+
+			el.addEventListener('dragover', evt => {
+				if (lastX != evt.offsetX || lastY != evt.offsetY || lastTarget != evt.target) {
+					// moved
+					lastTarget = evt.target;
+					lastX = evt.offsetX;
+					lastY = evt.offsetY;
+
+					stopCountdown();
+					startCountdown();
+				}
+			});
+
+			startCountdown();
+		}
+		function onLeave() {
+			stopCountdown();
+		}
+
+		// NOTE(chris): add save dragenter and dragleave events
+		// that won't fire when hovering over child elements
+
+		let skipLeave = false;
+		let skipLeaveParent = true;
+
+		function init(evt) {
+			skipLeave = false;
+			skipLeaveParent = true;
+			// add global listeners
+			window.addEventListener('dragenter', globalDragenter, true);
+			window.addEventListener('dragleave', globalDragleave, true);
+			window.addEventListener('drop', globalDrop, true);
+			// call enter
+			onEnter(evt);
+			// remove self
+			el.removeEventListener('dragenter', init);
+		}
+
+		function cleanup() {
+			// remove global listeners
+			window.removeEventListener('dragenter', globalDragenter, true);
+			window.removeEventListener('dragleave', globalDragleave, true);
+			window.removeEventListener('drop', globalDrop, true);
+			// call leave
+			onLeave();
+			// add init
+			el.addEventListener('dragenter', init);
+		}
+
+		function globalDragenter(evt) {
+			skipLeaveParent = false;
+			if (el != evt.target && !el.contains(evt.target)) {
+				cleanup();
+			} else {
+				skipLeave = true;
+			}
+		}
+		function globalDragleave(evt) {
+			if (el != evt.target && !el.contains(evt.target)) {
+				if (skipLeaveParent) {
+					skipLeaveParent = false;
+					return;
+				}
+			} else {
+				if (skipLeave) {
+					skipLeave = false;
+					return;
+				}
+			}
+			cleanup();
+		}
+		function globalDrop(evt) {
+			cleanup();
+		}
+
+		el.addEventListener('dragenter', init);
+		el.initFunc = init;
+	},
+	beforeUnmount(el) {
+		el.removeEventListener('dragenter', el.initFunc);
+		delete el.initFunc;
+	}
+}
diff --git a/public/js/directives/draggable.js b/public/js/directives/draggable.js
new file mode 100644
index 000000000..c72ad49f2
--- /dev/null
+++ b/public/js/directives/draggable.js
@@ -0,0 +1,97 @@
+import { setTransferData, convertToValidDragObject, dragendWorker } from '../helpers/DragAndDrop.js';
+
+const EFFECTS = [
+	'none',
+	'copy',
+	'copyLink',
+	'copyMove',
+	'link',
+	'linkMove',
+	'move',
+	'all',
+	'uninitialized'
+];
+
+export default {
+	mounted(el, binding, vnode) {
+		updateValue(el, binding.value);
+		updateEffectAllowed(el, binding.arg);
+
+		// if modifier capture is set we assume it's on a parent element
+		// i.e: for dragging multiple elements
+		// otherwise set draggable attribute
+		if (!binding.modifiers.capture) {
+			el.draggable = true;
+		}
+
+		el.addEventListener('dragstart', evt => {
+			const value = el.dataset.fhcDraggableValue;
+			if (value) {
+				setTransferData(evt, JSON.parse(value), true);
+				if (el.dataset.fhcEffectAllowed)
+					evt.dataTransfer.effectAllowed = el.dataset.fhcEffectAllowed;
+				blockDragend();
+			} else {
+				evt.preventDefault();
+			}
+		}, binding.modifiers.capture);
+
+		let id;
+		let evt = null;
+		let dataTransfer = null;
+		function blockDragend() {
+			id = el.dataset.fhcDraggableValue;
+			dragendWorker.port.postMessage(['init', id]);
+			window.addEventListener('dragend', blockHandler, true);
+		}
+		function unblockDragend(e) {
+			if (e) {
+				evt = e;
+				dataTransfer = e.dataTransfer;
+			}
+			window.removeEventListener('dragend', blockHandler, true);
+		}
+
+		function blockHandler(evt) {
+			if (evt.dataTransfer.dropEffect == 'none')
+				return unblockDragend();
+			unblockDragend(evt);
+			evt.stopPropagation();
+			dragendWorker.port.postMessage(['request']);
+		}
+
+		dragendWorker.port.onmessage = e => {
+			const [ func, ...args ] = e.data;
+			if (func != 'fire')
+				return;
+			const [ targetId ] = args;
+			if (targetId != id)
+				return;
+			if (evt === null)
+				unblockDragend();
+			else
+				el.dispatchEvent(evt);
+		}
+	},
+	updated(el, binding) {
+		updateValue(el, binding.value);
+		updateEffectAllowed(el, binding.arg);
+	}
+}
+
+// Helper functions
+function updateValue(el, value) {
+	value = convertToValidDragObject(value);
+	if (value) {
+		el.dataset.fhcDraggableValue = JSON.stringify(value);
+	} else if (el.dataset.fhcDraggableValue) {
+		delete el.dataset.fhcDraggableValue;
+	}
+}
+function updateEffectAllowed(el, effectAllowed) {
+	if (effectAllowed && EFFECTS.includes(effectAllowed)) {
+		el.dataset.fhcEffectAllowed = effectAllowed;
+	} else if (el.dataset.fhcEffectAllowed) {
+		delete el.dataset.fhcEffectAllowed;
+	}
+}
diff --git a/public/js/directives/drop.js b/public/js/directives/drop.js
new file mode 100644
index 000000000..12253386c
--- /dev/null
+++ b/public/js/directives/drop.js
@@ -0,0 +1,57 @@
+import { getValidTransferData, eventHasTypes, dragendWorker } from '../helpers/DragAndDrop.js';
+
+const EFFECTS = [
+	'move',
+	'copy',
+	'link',
+	'none'
+];
+
+let id = 0;
+		
+export default {
+	mounted(el, binding, vnode) {
+		const allowedTypes = Object.keys(binding.modifiers);
+		allowedTypes.forEach(type => {
+			if (type.substr(-11) == '-collection') {
+				const singleType = type.substr(0, type.length-11);
+				if (!allowedTypes.includes(singleType))
+					allowedTypes.push(singleType);
+			}
+		});
+
+		const strict = binding.arg.match(/(strict-|-strict)/);
+		const arg = binding.arg.replace(/(strict-|-strict)/, '');
+		const effect = EFFECTS.includes(arg) ? arg : null;
+
+		let allowed = false;
+
+		el.addEventListener('dragenter', evt => {
+			allowed = eventHasTypes(evt, allowedTypes, strict);
+			if (allowed)
+				evt.preventDefault();
+		});
+		el.addEventListener('dragover', evt => {
+			if (allowed) {
+				evt.preventDefault();
+				if (effect)
+					evt.dataTransfer.dropEffect = effect;
+			}
+		});
+		el.addEventListener('drop', evt => {
+			let result = getValidTransferData(evt, allowedTypes, strict);
+			if (!Array.isArray(result) && !binding.modifiers[result.type] && allowedTypes.includes(result.type + '-collection'))
+				result = [result];
+
+			const res = binding.value(evt, result);
+			if (res instanceof Promise) {
+				const localId = id++;
+				dragendWorker.port.postMessage(['block', localId]);
+				res.then(r => {
+					dragendWorker.port.postMessage(['unblock', localId]);
+					return r;
+				});
+			}
+		});
+	}
+}
diff --git a/public/js/helpers/DragAndDrop.js b/public/js/helpers/DragAndDrop.js
index 1160400f7..be068300c 100644
--- a/public/js/helpers/DragAndDrop.js
+++ b/public/js/helpers/DragAndDrop.js
@@ -1,67 +1,297 @@
 /**
  * TODO(chris): This is only a prototype!!!
  */
-const DragAndDrop = {
-	TYPE_LE: "lehreinheit",
-	TYPE_VEVENT: "vevent",
 
-	getValidTransferData(event, allowedTypes) {
-		const json = event.dataTransfer.getData('text');
-		let obj;
-		try {
-			obj = JSON.parse(json);
-			if (!obj.type)
-				return null;
-			if (allowedTypes && !allowedTypes.includes(obj.type))
-				return null;
-		} catch (error) {
-			return null;
-		}
-		return obj;
+const dragendWorker = new SharedWorker(new URL("../sharedworkers/dragend.js", import.meta.url));
+
+const TYPE_DEFINITION = {
+	lehreinheit: {
+		id: "lehreinheit_id",
+		dragIcon: "fa-solid fa-chalkboard-user",
+		extras: [
+			"stundenblockung"
+		]
 	},
-	isValidTransferData(event, allowedTypes) {
-		return this.getValidTransferData(event, allowedTypes) ? true : false;
+	vevent: {
+		id: "uid",
+		dragIcon: "fa-solid fa-calendar",
+		extras: [
+			"dtstart",
+			"dtend",
+			"summary"
+		]
 	},
-	getTransferData(event) {
-		const json = event.dataTransfer.getData('text');
-		return JSON.parse(json);
+	person: {
+		id: "person_id",
+		dragIcon: "fa-solid fa-user"
 	},
-	setTransferData(event, data) {
-		switch (data.type) {
-			case DragAndDrop.TYPE_LE:
-				data = DragAndDrop.fromLe(data);
-				break;
-			default:
-				if (data.dtstart && data.dtend && data.uid && data.summary) {
-					data = DragAndDrop.fromVEvent(data);
-					break;
-				}
-				return false; // No type found => abort
-		}
-		
-		event.dataTransfer.setData('text', JSON.stringify(data));
-		return true;
+	student: {
+		id: "student_uid",
+		dragIcon: "fa-solid fa-user-graduate"
 	},
-	fromLe(data) {
-		const {
-			type = DragAndDrop.TYPE_LE,
-			lehreinheit_id: id,
-			stundenblockung
-		} = data;
-		
-		return { type, id, stundenblockung };
-	},
-	fromVEvent(data) {
-		const {
-			type = DragAndDrop.TYPE_VEVENT,
-			uid: id,
-			dtstart,
-			dtend,
-			summary
-		} = data;
-		
-		return { type, id, dtstart, dtend, summary };
+	prestudent: {
+		id: "prestudent_id",
+		dragIcon: "fa-solid fa-user-graduate text-muted"
 	}
+	// TODO: IMPLEMENT OTHER TYPES
 };
 
-export default DragAndDrop;
+const VALID_TYPES = Object.keys(TYPE_DEFINITION);
+
+const TYPE_CONSTANTS = Object.keys(TYPE_DEFINITION).reduce((res, type) => {
+	res['TYPE_' + type.toUpperCase()] = type;
+	return res;
+}, {});
+
+function isValidDragObject(value) {
+	if (!value)
+		return false;
+	if (Array.isArray(value))
+		return value.every(isValidDragObject);
+	if (!value.type)
+		return false;
+
+	if (value.type.substr(-11) == '-collection') {
+		if (!value.hasOwnProperty('values'))
+			return false;
+
+		if (!VALID_TYPES.includes(value.type.substr(0, value.type.length-11)))
+			return false;
+	} else {
+		if (!value.hasOwnProperty('id'))
+			return false;
+
+		if (!VALID_TYPES.includes(value.type))
+			return false;
+
+		if (TYPE_DEFINITION[value.type].extras) {
+			if (!TYPE_DEFINITION[value.type].extras.every(extra => value.hasOwnProperty(extra)))
+				return false;
+		}
+	}
+
+	return true;
+}
+
+function getValidTransferData(event, allowedTypes, strict) {
+	let obj = null;
+
+	try {
+		obj = getTransferData(event, strict);
+		if (!obj)
+			return null;
+
+		if (!strict && Array.isArray(obj)) {
+			obj = obj.filter(isValidDragObject);
+			if (!obj.length)
+				return null;
+		} else if (!isValidDragObject(obj))
+			return null;
+
+		if (allowedTypes && allowedTypes.length) {
+			if (Array.isArray(obj)) {
+				if (strict && !obj.every(v => allowedTypes.includes(v.type))) {
+					return null;
+				} else if (!strict) {
+					obj = obj.filter(v => allowedTypes.includes(v.type));
+					if (!obj.length)
+						return null;
+				}
+			} else if (!allowedTypes.includes(obj.type)) {
+				return null;
+			}
+		}
+	} catch(error) {
+		return null;
+	}
+
+	if (Array.isArray(obj) && obj.length == 1)
+		return obj.find(Boolean);
+
+	return obj;
+}
+
+function isValidTransferData(event, allowedTypes, strict) {
+	return getValidTransferData(event, allowedTypes, strict) ? true : false;
+}
+
+function getTransferData(event, strict) {
+	const result = [];
+
+	for (const type of event.dataTransfer.types) {
+		if (type.substr(0, 4) != 'fhc/') {
+			if (strict)
+				return null;
+			continue;
+		}
+		let base_type = type.substr(4);
+		let collection = false;
+		if (base_type.substr(-11) == '-collection') {
+			base_type = base_type.substr(0, base_type.length-11);
+			collection = true;
+		}
+		if (!VALID_TYPES.includes(base_type)) {
+			if (strict)
+				return null;
+			continue;
+		}
+		let data = JSON.parse(event.dataTransfer.getData(type));
+		if (collection)
+			result.push(...data.values);
+		else
+			result.push(data);
+	}
+
+	if (!result.length)
+		return null;
+
+	if (result.length == 1)
+		return result[0];
+
+	return result;
+}
+
+function convertToValidDragObject(data, strict) {
+	if (Array.isArray(data)) {
+		const converted = data.map(convertToValidDragObject).filter(Boolean);
+		if (!converted.length)
+			return undefined;
+		if (strict && converted.length != data.length)
+			return undefined;
+
+		const sorted = converted.reduce((res, item) => {
+			if (!res[item.type])
+				res[item.type] = [];
+			res[item.type].push(item);
+			return res;
+		}, {});
+
+		return Object.entries(sorted).map(([type, values]) => {
+			if (values.length > 1) {
+				return {
+					type: type + '-collection',
+					values
+				};
+			}
+			return values[0];
+		});
+	}
+
+	if (data.hasOwnProperty('type') && isValidDragObject(data)) {
+		return data;
+	}
+
+	const found = Object.entries(TYPE_DEFINITION).find(([type, typedef]) => {
+		if (!data.hasOwnProperty(typedef.id))
+			return false;
+		if (typedef.extras) {
+			if (!typedef.extras.every(extra => data.hasOwnProperty("extra")))
+				return false;
+		}
+		return true;
+	});
+
+	if (!found) {
+		return undefined;
+	}
+
+	const [ type, typedef ] = found;
+
+	const newData = {};
+	newData.type = type;
+	newData.id = data[typedef.id];
+	if (typedef.extras)
+		typedef.extras.forEach(extra => newData[extras] = data[extra]);
+
+	return newData;
+}
+
+function setTransferData(event, validDragObject, setDragImage = false) {
+	if (setDragImage) {
+		const dragItems = Array.isArray(validDragObject) ? validDragObject : [ validDragObject ];
+		const dragElements = dragItems.map(item => {
+			const icon = document.createElement('i');
+			const label = document.createElement('span');
+			const iconContainer = document.createElement('span');
+
+			iconContainer.className = 'btn btn-outline-dark bg-light';
+			label.className = 'small';
+
+			if (TYPE_DEFINITION[item.type]) {
+				icon.className = TYPE_DEFINITION[item.type].dragIcon || 'fa-solid fa-question';
+				label.textContent = item.id;
+			} else if (item.type.substr(-11) == '-collection' && TYPE_DEFINITION[item.type.substr(0, item.type.length-11)]) {
+				iconContainer.style.boxShadow = '3px 3px var(--bs-btn-border-color)';
+				icon.className = TYPE_DEFINITION[item.type.substr(0, item.type.length-11)].dragIcon || 'fa-solid fa-question';
+				label.textContent = 'x' + item.values.length;
+			} else {
+				icon.className = 'fa-solid fa-question';
+				label.textContent = item.id || '';
+			}
+			
+			iconContainer.append(icon);
+
+			const itemContainer = document.createElement('div');
+			itemContainer.className = 'd-flex flex-column align-items-center gap-2 small';
+			itemContainer.append(iconContainer, label);
+			return itemContainer;
+		});
+
+		const container = document.createElement('div');
+		container.className = 'd-flex flex-row gap-2 small';
+		container.append(...dragElements);
+
+		document.body.append(container);
+		event.dataTransfer.setDragImage(container, -25, 0);
+		requestAnimationFrame(() => {
+			document.body.removeChild(container);
+		});
+	}
+	if (Array.isArray(validDragObject)) {
+		return validDragObject.forEach(data => setTransferData(event, data));
+	}
+	
+	event.dataTransfer.setData('fhc/' + validDragObject.type, JSON.stringify(validDragObject));
+}
+
+/**
+ * check if the dataTransfer types are in the allowed types array
+ * if strict is disabled at least one type must be the allowed array
+ * otherwise all types have to be in the allowed array
+ *
+ * @param Event		event
+ * @param Array		allowedTypes
+ * @param Boolean	strict
+ */
+function eventHasTypes(event, allowedTypes, strict) {
+	if (!allowedTypes || !allowedTypes.length)
+		allowedTypes = VALID_TYPES;
+	allowedTypes = allowedTypes.map(type => 'fhc/' + type);
+	
+	if (!strict)
+		return allowedTypes.some(type => event.dataTransfer.types.includes(type));
+	
+	return event.dataTransfer.types.every(type => allowedTypes.includes(type));
+}
+
+export {
+	isValidDragObject,
+	getValidTransferData,
+	isValidTransferData,
+	getTransferData,
+	convertToValidDragObject,
+	setTransferData,
+	eventHasTypes,
+	dragendWorker
+};
+export default {
+	...TYPE_CONSTANTS,
+	isValidDragObject,
+	getValidTransferData,
+	isValidTransferData,
+	getTransferData,
+	convertToValidDragObject,
+	setTransferData,
+	eventHasTypes,
+	dragendWorker
+};
diff --git a/public/js/sharedworkers/dragend.js b/public/js/sharedworkers/dragend.js
new file mode 100644
index 000000000..64179afa6
--- /dev/null
+++ b/public/js/sharedworkers/dragend.js
@@ -0,0 +1,30 @@
+let dragEndCallback = null;
+
+onconnect = e => {
+	const port = e.ports[0];
+
+	const cbList = [];
+
+	port.onmessage = e => {
+		const [ func, ...args ] = e.data;
+		switch (func) {
+		case 'init':
+			dragEndCallback = () => {
+				port.postMessage(['fire', args]);
+			};
+			break;
+		case 'block':
+			cbList[args[0]] = dragEndCallback;
+			dragEndCallback = null;
+			break;
+		case 'unblock':
+			cbList[args[0]]();
+			break;
+		case 'request':
+			if (dragEndCallback) {
+				dragEndCallback();
+				dragEndCallback = null;
+			}
+		}
+	};
+};

From 86bbfe42dbc60d5eb312f6dafa03c4d60d1cb470 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 10 Sep 2025 11:21:58 +0200
Subject: [PATCH 041/101] missing break

---
 public/js/sharedworkers/dragend.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/sharedworkers/dragend.js b/public/js/sharedworkers/dragend.js
index 64179afa6..0b80e972a 100644
--- a/public/js/sharedworkers/dragend.js
+++ b/public/js/sharedworkers/dragend.js
@@ -25,6 +25,7 @@ onconnect = e => {
 				dragEndCallback();
 				dragEndCallback = null;
 			}
+			break;
 		}
 	};
 };

From 3a06dc613f4b74b6d353dc8571e9536c678f2c6c Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 10 Sep 2025 17:28:15 +0200
Subject: [PATCH 042/101] Studierendenverwalung Projektarbeiten: preserve data
 before saved, modal not closed after saving

---
 .../Details/Projektarbeit/Details.js                  |  1 +
 .../Details/Projektarbeit/Projektarbeit.js            | 10 ++++++----
 .../Details/Projektarbeit/Projektbetreuer.js          | 11 +++--------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index b7aea7169..35a4f5f8a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -165,6 +165,7 @@ export default {
 		},
 		loadProjektarbeit(projektarbeit_id) {
 
+			if (this?.formData?.projektarbeit_id == projektarbeit_id) return;
 			this.resetForm();
 			return this.$api
 				.call(ApiStvProjektarbeit.loadProjektarbeit(projektarbeit_id))
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 952c47860..f78963066 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -263,14 +263,17 @@ export default {
 		actionEditProjektarbeit() {
 			this.statusNew = false;
 			this.toggleMenu('details');
-			this.$refs.projektarbeitDetails.getFormData(this.statusNew, this.editedProjektarbeit.studiensemester_kurzbz, this.editedProjektarbeit.lehrveranstaltung_id);
+			this.$refs.projektarbeitDetails.getFormData(
+				this.statusNew, this.editedProjektarbeit.studiensemester_kurzbz, this.editedProjektarbeit.lehrveranstaltung_id
+			);
 			this.$refs.projektarbeitDetails.loadProjektarbeit(this.editedProjektarbeit.projektarbeit_id);
 			this.$refs.projektarbeitModal.show();
 		},
 		actionEditBetreuer() {
-			this.statusNew = false;
 			this.toggleMenu('betreuer');
-			this.$refs.projektbetreuer.getData(this.editedProjektarbeit.projektarbeit_id, this.editedProjektarbeit.studiensemester_kurzbz, this.editedProjektarbeit.projekttyp_kurzbz);
+			this.$refs.projektbetreuer.getData(
+				this.editedProjektarbeit.projektarbeit_id, this.editedProjektarbeit.studiensemester_kurzbz, this.editedProjektarbeit.projekttyp_kurzbz
+			);
 			this.$refs.projektarbeitModal.show();
 		},
 		actionDeleteProjektarbeit(projektarbeit_id) {
@@ -310,7 +313,6 @@ export default {
 		projektarbeitSaved() {
 			this.reload();
 			this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-			this.hideModal('projektarbeitModal');
 		},
 		setDefaultStunden(projekttyp_kurzbz) {
 			this.$refs.projektbetreuer.setDefaultStunden(projekttyp_kurzbz);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 1eb19e3fd..1290aa036 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -193,15 +193,13 @@ export default {
 								betr.betreuerart_kurzbz === betreuerart_kurzbz
 						);
 
-					let betreuer = [];
 					if (idx >= 0) { // if betreuer found
-						betreuer = projektbetreuerListe[idx];
 
-						// set currently edited betreuer
-						this.formData = betreuer;
+						// set currently edited betreuer (deep copy)
+						this.formData = JSON.parse(JSON.stringify(projektbetreuerListe[idx]));
 
 						// set download link
-						if (betreuer.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = betreuer.beurteilungDownloadLink;
+						if (this.formData.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = this.formData.beurteilungDownloadLink;
 
 						// set betreuer for autocomplete field
 						this.autocompleteSelectedBetreuer = {
@@ -244,7 +242,6 @@ export default {
 			// default Stundensätze from config
 			this.defaultFormDataValues.stunden = this.getDefaultStunden(projekttyp_kurzbz);
 			this.defaultFormDataValues.stundensatz = this.config.defaultProjektbetreuerStundensatz;
-			this.resetModes();
 
 			// get other initial data
 			this.$api
@@ -266,7 +263,6 @@ export default {
 				this.getProjektbetreuer();
 			} else {
 				this.$refs.projektbetreuerTable.tabulator.setData([]);
-				this.resetForm();
 			}
 		},
 		getProjektbetreuer() {
@@ -274,7 +270,6 @@ export default {
 				.call(ApiStvProjektbetreuer.getProjektbetreuer(this.projektarbeit_id))
 				.then(result => {
 					this.$refs.projektbetreuerTable.tabulator.replaceData(this.addIds(result.data));
-					this.resetForm();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},

From 112211fb0bdfa455c3a53f92fd025a74406cf02c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 11 Sep 2025 13:11:34 +0200
Subject: [PATCH 043/101] move function

---
 public/js/components/Stv/Studentenverwaltung/List.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 9e4cd4296..7c6f57f48 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -284,6 +284,12 @@ export default {
 			} else
 				this.$refs.table.tabulator.setData(endpoint.url, params);
 		},
+		dragCleanup(evt) {
+			if (evt.dataTransfer.dropEffect == 'none')
+				return; // aborted or wrong target
+			
+			this.$reloadList();
+		},
 		onKeydown(e) { // TODO(chris): this should be in the filter component
 			if (!this.focusObj)
 				return;
@@ -344,12 +350,6 @@ export default {
 				if (el != this.focusObj)
 					this.changeFocus(this.focusObj, el);
 			}
-		},
-		dragCleanup(evt) {
-			if (evt.dataTransfer.dropEffect == 'none')
-				return; // aborted or wrong target
-			
-			this.$reloadList();
 		}
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component

From ee6e7f3a48ac30f538a29a91f3528662e019db83 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 11 Sep 2025 13:13:57 +0200
Subject: [PATCH 044/101] finetuning drag&drop

---
 public/js/directives/dragClick.js  | 100 ++++++++---------------------
 public/js/directives/draggable.js  |  76 +++++++++++-----------
 public/js/directives/drop.js       |  44 +++++++++----
 public/js/helpers/DragAndDrop.js   |  91 +++++++++++++++++++++++---
 public/js/sharedworkers/dragend.js |  31 ---------
 5 files changed, 180 insertions(+), 162 deletions(-)
 delete mode 100644 public/js/sharedworkers/dragend.js

diff --git a/public/js/directives/dragClick.js b/public/js/directives/dragClick.js
index aeeafb818..5603eb93f 100644
--- a/public/js/directives/dragClick.js
+++ b/public/js/directives/dragClick.js
@@ -1,3 +1,5 @@
+import { bindDragEnterLeave } from '../helpers/DragAndDrop.js';
+
 export default {
 	mounted(el, binding) {
 		const delay = parseInt(binding.arg) || 300;
@@ -12,90 +14,40 @@ export default {
 			timeout = null;
 		}
 
+		let lastTarget;
+		let lastX;
+		let lastY;
+
+		function onDragOver(evt) {
+			if (lastX != evt.offsetX || lastY != evt.offsetY || lastTarget != evt.target) {
+				// moved
+				lastTarget = evt.target;
+				lastX = evt.offsetX;
+				lastY = evt.offsetY;
+
+				stopCountdown();
+				startCountdown();
+			}
+		}
+
 		function onEnter(evt) {
-			let lastTarget = evt.target;
-			let lastX = evt.offsetX;
-			let lastY = evt.offsetY;
+			lastTarget = evt.target;
+			lastX = evt.offsetX;
+			lastY = evt.offsetY;
 
-			el.addEventListener('dragover', evt => {
-				if (lastX != evt.offsetX || lastY != evt.offsetY || lastTarget != evt.target) {
-					// moved
-					lastTarget = evt.target;
-					lastX = evt.offsetX;
-					lastY = evt.offsetY;
-
-					stopCountdown();
-					startCountdown();
-				}
-			});
+			el.addEventListener('dragover', onDragOver);
 
 			startCountdown();
 		}
 		function onLeave() {
 			stopCountdown();
+			el.removeEventListener('dragover', onDragOver);
 		}
 
-		// NOTE(chris): add save dragenter and dragleave events
-		// that won't fire when hovering over child elements
-
-		let skipLeave = false;
-		let skipLeaveParent = true;
-
-		function init(evt) {
-			skipLeave = false;
-			skipLeaveParent = true;
-			// add global listeners
-			window.addEventListener('dragenter', globalDragenter, true);
-			window.addEventListener('dragleave', globalDragleave, true);
-			window.addEventListener('drop', globalDrop, true);
-			// call enter
-			onEnter(evt);
-			// remove self
-			el.removeEventListener('dragenter', init);
-		}
-
-		function cleanup() {
-			// remove global listeners
-			window.removeEventListener('dragenter', globalDragenter, true);
-			window.removeEventListener('dragleave', globalDragleave, true);
-			window.removeEventListener('drop', globalDrop, true);
-			// call leave
-			onLeave();
-			// add init
-			el.addEventListener('dragenter', init);
-		}
-
-		function globalDragenter(evt) {
-			skipLeaveParent = false;
-			if (el != evt.target && !el.contains(evt.target)) {
-				cleanup();
-			} else {
-				skipLeave = true;
-			}
-		}
-		function globalDragleave(evt) {
-			if (el != evt.target && !el.contains(evt.target)) {
-				if (skipLeaveParent) {
-					skipLeaveParent = false;
-					return;
-				}
-			} else {
-				if (skipLeave) {
-					skipLeave = false;
-					return;
-				}
-			}
-			cleanup();
-		}
-		function globalDrop(evt) {
-			cleanup();
-		}
-
-		el.addEventListener('dragenter', init);
-		el.initFunc = init;
+		el.fhcDragClickCleanup = bindDragEnterLeave(el, onEnter, onLeave);
 	},
 	beforeUnmount(el) {
-		el.removeEventListener('dragenter', el.initFunc);
-		delete el.initFunc;
+		el.fhcDragClickCleanup();
+		delete el.fhcDragClickCleanup;
 	}
 }
diff --git a/public/js/directives/draggable.js b/public/js/directives/draggable.js
index c72ad49f2..052fcb542 100644
--- a/public/js/directives/draggable.js
+++ b/public/js/directives/draggable.js
@@ -1,4 +1,4 @@
-import { setTransferData, convertToValidDragObject, dragendWorker } from '../helpers/DragAndDrop.js';
+import { setTransferData, convertToValidDragObject } from '../helpers/DragAndDrop.js';
 
 const EFFECTS = [
 	'none',
@@ -24,58 +24,62 @@ export default {
 			el.draggable = true;
 		}
 
-		el.addEventListener('dragstart', evt => {
+		const bcc = new BroadcastChannel('fhc-dnd');
+		let blocked = false;
+
+		function onStart(evt) {
 			const value = el.dataset.fhcDraggableValue;
 			if (value) {
 				setTransferData(evt, JSON.parse(value), true);
 				if (el.dataset.fhcEffectAllowed)
 					evt.dataTransfer.effectAllowed = el.dataset.fhcEffectAllowed;
-				blockDragend();
+
+				bcc.onmessage = e => {
+					if (e.data == 'block') {
+						blocked = true;
+					} else if (e.data == 'release') {
+						let evt = null;
+						if (blocked && blocked.evt) {
+							evt = blocked.evt;
+						}
+						blocked = false;
+						if (evt)
+							el.dispatchEvent(evt);
+					}
+				};
 			} else {
 				evt.preventDefault();
 			}
-		}, binding.modifiers.capture);
-
-		let id;
-		let evt = null;
-		let dataTransfer = null;
-		function blockDragend() {
-			id = el.dataset.fhcDraggableValue;
-			dragendWorker.port.postMessage(['init', id]);
-			window.addEventListener('dragend', blockHandler, true);
 		}
-		function unblockDragend(e) {
-			if (e) {
-				evt = e;
-				dataTransfer = e.dataTransfer;
+
+		function onEnd(evt) {
+			if (blocked) {
+				blocked = {
+					evt,
+					dt: evt.dataTransfer
+				};
+				evt.stopPropagation();
+				el.dispatchEvent(new DragEvent("beforedragend", evt));
+			} else {
+				bcc.onmessage = () => {};
 			}
-			window.removeEventListener('dragend', blockHandler, true);
 		}
+		el.addEventListener('dragstart', onStart, binding.modifiers.capture);
 
-		function blockHandler(evt) {
-			if (evt.dataTransfer.dropEffect == 'none')
-				return unblockDragend();
-			unblockDragend(evt);
-			evt.stopPropagation();
-			dragendWorker.port.postMessage(['request']);
-		}
+		el.addEventListener('dragend', onEnd, true);
 
-		dragendWorker.port.onmessage = e => {
-			const [ func, ...args ] = e.data;
-			if (func != 'fire')
-				return;
-			const [ targetId ] = args;
-			if (targetId != id)
-				return;
-			if (evt === null)
-				unblockDragend();
-			else
-				el.dispatchEvent(evt);
-		}
+		el.fhcDraggableCleanup = () => {
+			el.removeEventListener('dragstart', onStart, binding.modifiers.capture);
+			el.removeEventListener('dragend', onEnd, true);
+		};
 	},
 	updated(el, binding) {
 		updateValue(el, binding.value);
 		updateEffectAllowed(el, binding.arg);
+	},
+	beforeUnmount(el) {
+		el.fhcDraggableCleanup();
+		delete el.fhcDraggableCleanup;
 	}
 }
 
diff --git a/public/js/directives/drop.js b/public/js/directives/drop.js
index 12253386c..35afa66de 100644
--- a/public/js/directives/drop.js
+++ b/public/js/directives/drop.js
@@ -1,4 +1,4 @@
-import { getValidTransferData, eventHasTypes, dragendWorker } from '../helpers/DragAndDrop.js';
+import { getValidTransferData, eventHasTypes, bindDragEnterLeave } from '../helpers/DragAndDrop.js';
 
 const EFFECTS = [
 	'move',
@@ -24,34 +24,56 @@ export default {
 		const arg = binding.arg.replace(/(strict-|-strict)/, '');
 		const effect = EFFECTS.includes(arg) ? arg : null;
 
+		const bcc = new BroadcastChannel('fhc-dnd');
 		let allowed = false;
 
-		el.addEventListener('dragenter', evt => {
+		function onEnter(evt) {
 			allowed = eventHasTypes(evt, allowedTypes, strict);
-			if (allowed)
+			if (allowed) {
 				evt.preventDefault();
-		});
-		el.addEventListener('dragover', evt => {
+				bcc.postMessage('block');
+			}
+		}
+		function onLeave(evt, wasDropped) {
+			if (allowed && !wasDropped) {
+				bcc.postMessage('release');
+			}
+		}
+		function onOver(evt) {
 			if (allowed) {
 				evt.preventDefault();
 				if (effect)
 					evt.dataTransfer.dropEffect = effect;
 			}
-		});
-		el.addEventListener('drop', evt => {
+		}
+		function onDrop(evt) {
 			let result = getValidTransferData(evt, allowedTypes, strict);
 			if (!Array.isArray(result) && !binding.modifiers[result.type] && allowedTypes.includes(result.type + '-collection'))
 				result = [result];
 
 			const res = binding.value(evt, result);
+			
 			if (res instanceof Promise) {
-				const localId = id++;
-				dragendWorker.port.postMessage(['block', localId]);
 				res.then(r => {
-					dragendWorker.port.postMessage(['unblock', localId]);
+					bcc.postMessage('release');
 					return r;
 				});
+			} else {
+				bcc.postMessage('release');
 			}
-		});
+		}
+
+		const cleanupEnterLeave = bindDragEnterLeave(el, onEnter, onLeave);
+		el.addEventListener('dragover', onOver);
+		el.addEventListener('drop', onDrop);
+		el.fhcDropCleanup = () => {
+			cleanupEnterLeave();
+			el.removeEventListener('dragover', onOver);
+			el.removeEventListener('drop', onDrop);
+		};
+	},
+	beforeUnmount(el) {
+		el.fhcDropCleanup();
+		delete el.fhcDropCleanup;
 	}
 }
diff --git a/public/js/helpers/DragAndDrop.js b/public/js/helpers/DragAndDrop.js
index be068300c..8bf574746 100644
--- a/public/js/helpers/DragAndDrop.js
+++ b/public/js/helpers/DragAndDrop.js
@@ -2,8 +2,6 @@
  * TODO(chris): This is only a prototype!!!
  */
 
-const dragendWorker = new SharedWorker(new URL("../sharedworkers/dragend.js", import.meta.url));
-
 const TYPE_DEFINITION = {
 	lehreinheit: {
 		id: "lehreinheit_id",
@@ -119,12 +117,12 @@ function getTransferData(event, strict) {
 	const result = [];
 
 	for (const type of event.dataTransfer.types) {
-		if (type.substr(0, 4) != 'fhc/') {
+		if (type.substr(0, 16) != 'application/fhc-') {
 			if (strict)
 				return null;
 			continue;
 		}
-		let base_type = type.substr(4);
+		let base_type = type.substr(16);
 		let collection = false;
 		if (base_type.substr(-11) == '-collection') {
 			base_type = base_type.substr(0, base_type.length-11);
@@ -251,7 +249,7 @@ function setTransferData(event, validDragObject, setDragImage = false) {
 		return validDragObject.forEach(data => setTransferData(event, data));
 	}
 	
-	event.dataTransfer.setData('fhc/' + validDragObject.type, JSON.stringify(validDragObject));
+	event.dataTransfer.setData('application/fhc-' + validDragObject.type, JSON.stringify(validDragObject));
 }
 
 /**
@@ -266,12 +264,85 @@ function setTransferData(event, validDragObject, setDragImage = false) {
 function eventHasTypes(event, allowedTypes, strict) {
 	if (!allowedTypes || !allowedTypes.length)
 		allowedTypes = VALID_TYPES;
-	allowedTypes = allowedTypes.map(type => 'fhc/' + type);
+	allowedTypes = allowedTypes.map(type => 'application/fhc-' + type);
+
+	const dataTypes = [...event.dataTransfer.types];
+	
+	// NOTE(chris): if dragging across browsers the dataTransfer object is
+	// set to a default one without data. Since we do not support dragging
+	// across browsers (yet) we return false which will disallow dropping.
+	if (!dataTypes.length)
+		return false;
 	
 	if (!strict)
-		return allowedTypes.some(type => event.dataTransfer.types.includes(type));
+		return allowedTypes.some(type => [...event.dataTransfer.types].includes(type));
 	
-	return event.dataTransfer.types.every(type => allowedTypes.includes(type));
+	return [...event.dataTransfer.types].every(type => allowedTypes.includes(type));
+}
+
+function bindDragEnterLeave(el, onEnter, onLeave) {
+	// NOTE(chris): add save dragenter and dragleave events
+	// that won't fire when hovering over child elements
+
+	let skipLeave = false;
+	let skipLeaveParent = true;
+
+	function init(evt) {
+		skipLeave = false;
+		skipLeaveParent = true;
+		// add global listeners
+		window.addEventListener('dragenter', globalDragenter, true);
+		window.addEventListener('dragleave', globalDragleave, true);
+		window.addEventListener('drop', globalDrop, true);
+		// call enter
+		onEnter(evt);
+		// remove self
+		el.removeEventListener('dragenter', init);
+	}
+
+	function cleanup(evt, wasDropped) {
+		// remove global listeners
+		window.removeEventListener('dragenter', globalDragenter, true);
+		window.removeEventListener('dragleave', globalDragleave, true);
+		window.removeEventListener('drop', globalDrop, true);
+		// call leave
+		onLeave(evt, wasDropped);
+		// add init
+		el.addEventListener('dragenter', init);
+	}
+
+	function globalDragenter(evt) {
+		skipLeaveParent = false;
+		if (el != evt.target && !el.contains(evt.target)) {
+			cleanup(evt);
+		} else {
+			skipLeave = true;
+		}
+	}
+	function globalDragleave(evt) {
+		if (el != evt.target && !el.contains(evt.target)) {
+			if (skipLeaveParent) {
+				skipLeaveParent = false;
+				return;
+			}
+		} else {
+			if (skipLeave) {
+				skipLeave = false;
+				return;
+			}
+		}
+		cleanup(evt);
+	}
+	function globalDrop(evt) {
+		cleanup(evt, true);
+	}
+
+	el.addEventListener('dragenter', init);
+
+	return () => {
+		// cleanup
+		el.removeEventListener('dragenter', init);
+	}
 }
 
 export {
@@ -282,7 +353,7 @@ export {
 	convertToValidDragObject,
 	setTransferData,
 	eventHasTypes,
-	dragendWorker
+	bindDragEnterLeave
 };
 export default {
 	...TYPE_CONSTANTS,
@@ -293,5 +364,5 @@ export default {
 	convertToValidDragObject,
 	setTransferData,
 	eventHasTypes,
-	dragendWorker
+	bindDragEnterLeave
 };
diff --git a/public/js/sharedworkers/dragend.js b/public/js/sharedworkers/dragend.js
deleted file mode 100644
index 0b80e972a..000000000
--- a/public/js/sharedworkers/dragend.js
+++ /dev/null
@@ -1,31 +0,0 @@
-let dragEndCallback = null;
-
-onconnect = e => {
-	const port = e.ports[0];
-
-	const cbList = [];
-
-	port.onmessage = e => {
-		const [ func, ...args ] = e.data;
-		switch (func) {
-		case 'init':
-			dragEndCallback = () => {
-				port.postMessage(['fire', args]);
-			};
-			break;
-		case 'block':
-			cbList[args[0]] = dragEndCallback;
-			dragEndCallback = null;
-			break;
-		case 'unblock':
-			cbList[args[0]]();
-			break;
-		case 'request':
-			if (dragEndCallback) {
-				dragEndCallback();
-				dragEndCallback = null;
-			}
-			break;
-		}
-	};
-};

From 6658e80d998dee5602510713d8bbffb52cd874c0 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 11 Sep 2025 14:58:20 +0200
Subject: [PATCH 045/101] code quality

---
 .../Stv/Studentenverwaltung/Details/Groups.js  |  6 +++---
 .../Studentenverwaltung/Details/Groups/Lvb.js  |  1 -
 .../Details/Groups/Special.js                  |  2 +-
 .../components/Stv/Studentenverwaltung/List.js | 16 +++++++++++-----
 .../Stv/Studentenverwaltung/Verband.js         |  4 ++--
 public/js/directives/draggable.js              |  2 +-
 public/js/directives/drop.js                   |  4 +---
 public/js/helpers/DragAndDrop.js               | 18 +++++++++---------
 8 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Groups.js b/public/js/components/Stv/Studentenverwaltung/Details/Groups.js
index fab9511fe..45c0bf929 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Groups.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Groups.js
@@ -142,13 +142,13 @@ export default {
 			}
 			this.$api
 				.call(endpoint)
-				.then(result => {
+				.then(() => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$reloadList();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		addSpecialGroup(params) {
+		addSpecialGroup() {
 			const gruppe_kurzbz = this.$refs.newGroupModal.value.gruppe_kurzbz || this.$refs.newGroupModal.value;
 
 			if (Array.isArray(this.modelValue)) {
@@ -183,7 +183,7 @@ export default {
 			} else {
 				this.$refs.newGroupModal.$refs.form
 					.call(ApiStvGroups.add(this.modelValue.uid, gruppe_kurzbz, this.currentSemester))
-					.then(result => {
+					.then(() => {
 						this.$refs.newGroupModal.hide();
 						this.$fhcAlert.alertSuccess(this.$p.t('gruppenmanagement/groups_added', { n: 1 }));
 						this.$refs.list.reload();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Groups/Lvb.js b/public/js/components/Stv/Studentenverwaltung/Details/Groups/Lvb.js
index db94d359c..8af63323b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Groups/Lvb.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Groups/Lvb.js
@@ -162,7 +162,6 @@ export default {
 			if (this.studiengang_kz === false)
 				return;
 
-			let lvbList;
 			this.$api
 				.call(ApiStvLvb.getTree(this.studiengang_kz))
 				.then(result => this.lvbList = result.data)
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Groups/Special.js b/public/js/components/Stv/Studentenverwaltung/Details/Groups/Special.js
index 90b4c15ec..b6d9c8930 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Groups/Special.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Groups/Special.js
@@ -45,7 +45,7 @@ export default {
 				this.hide();
 			}
 		},
-		onEnter(evt) {
+		onEnter() {
 			/**
 			 * NOTE(chris): PrimeVue: AutoComplete: Enter does not submit form #5618
 			 * @see https://github.com/primefaces/primevue/issues/5618
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 7c6f57f48..765009060 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -59,8 +59,12 @@ export default {
 					{title:"Vornamen", field:"vornamen", visible:false, headerFilter: true},
 					{title:"TitelPost", field:"titelpost", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{title:"Ersatzkennzeichen", field:"ersatzkennzeichen", headerFilter: true},
-					{title:"Geburtsdatum", field:"gebdatum", formatter:dateFormatter, 
-						headerFilter: true, headerFilterFunc: function(headerValue, rowValue, rowData, filterParams) {
+					{
+						title: "Geburtsdatum",
+						field: "gebdatum",
+						formatter: dateFormatter, 
+						headerFilter: true,
+						headerFilterFunc(headerValue, rowValue) {
 							const matches = headerValue.match(/^(([0-9]{2})\.)?([0-9]{2})\.([0-9]{4})?$/);
 							let comparestr = headerValue;
 							if(matches !== null) {
@@ -293,11 +297,13 @@ export default {
 		onKeydown(e) { // TODO(chris): this should be in the filter component
 			if (!this.focusObj)
 				return;
+
+			var next;
 			switch (e.code) {
 				case 'Enter':
 				case 'Space':
 					e.preventDefault();
-					const e2 = new Event('click', e);
+					var e2 = new Event('click', e);
 					e2.altKey = e.altKey;
 					e2.ctrlKey = e.ctrlKey;
 					e2.shiftKey = e.shiftKey;
@@ -306,13 +312,13 @@ export default {
 					break;
 				case 'ArrowUp':
 					e.preventDefault();
-					var next = this.focusObj.previousElementSibling;
+					next = this.focusObj.previousElementSibling;
 					if (next)
 						this.changeFocus(this.focusObj, next);
 					break;
 				case 'ArrowDown':
 					e.preventDefault();
-					var next = this.focusObj.nextElementSibling;
+					next = this.focusObj.nextElementSibling;
 					if (next)
 						this.changeFocus(this.focusObj, next);
 					break;
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index cfa7f0aed..db0070a37 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -240,7 +240,7 @@ export default {
 				res += ' (' + student.vorname + ' ' + student.nachname + ')';
 			return res;
 		},
-		dropStudents(node, students, evt) {
+		dropStudents(node, students) {
 			const data = node.data;
 			
 			let endpoint;
@@ -335,7 +335,7 @@ export default {
 						:data-tree-item-key="node.key"
 						:title="node.data.studiengang_kz"
 						v-drag-click="() => toggleTreeNode(node)"
-						v-drop:link-strict.student-collection="(evt, students) => dropStudents(node, students, evt)"
+						v-drop:link-strict.student-collection="(evt, students) => dropStudents(node, students)"
 					>
 						{{ node.data.name }}
 					</span>
diff --git a/public/js/directives/draggable.js b/public/js/directives/draggable.js
index 052fcb542..64747c15a 100644
--- a/public/js/directives/draggable.js
+++ b/public/js/directives/draggable.js
@@ -13,7 +13,7 @@ const EFFECTS = [
 ];
 
 export default {
-	mounted(el, binding, vnode) {
+	mounted(el, binding) {
 		updateValue(el, binding.value);
 		updateEffectAllowed(el, binding.arg);
 
diff --git a/public/js/directives/drop.js b/public/js/directives/drop.js
index 35afa66de..4c50e1b8e 100644
--- a/public/js/directives/drop.js
+++ b/public/js/directives/drop.js
@@ -7,10 +7,8 @@ const EFFECTS = [
 	'none'
 ];
 
-let id = 0;
-		
 export default {
-	mounted(el, binding, vnode) {
+	mounted(el, binding) {
 		const allowedTypes = Object.keys(binding.modifiers);
 		allowedTypes.forEach(type => {
 			if (type.substr(-11) == '-collection') {
diff --git a/public/js/helpers/DragAndDrop.js b/public/js/helpers/DragAndDrop.js
index 8bf574746..f98697eb2 100644
--- a/public/js/helpers/DragAndDrop.js
+++ b/public/js/helpers/DragAndDrop.js
@@ -50,20 +50,20 @@ function isValidDragObject(value) {
 		return false;
 
 	if (value.type.substr(-11) == '-collection') {
-		if (!value.hasOwnProperty('values'))
+		if (!Object.prototype.hasOwnProperty.call(value, 'values'))
 			return false;
 
 		if (!VALID_TYPES.includes(value.type.substr(0, value.type.length-11)))
 			return false;
 	} else {
-		if (!value.hasOwnProperty('id'))
+		if (!Object.prototype.hasOwnProperty.call(value, 'id'))
 			return false;
 
 		if (!VALID_TYPES.includes(value.type))
 			return false;
 
 		if (TYPE_DEFINITION[value.type].extras) {
-			if (!TYPE_DEFINITION[value.type].extras.every(extra => value.hasOwnProperty(extra)))
+			if (!TYPE_DEFINITION[value.type].extras.every(extra => Object.prototype.hasOwnProperty.call(value, extra)))
 				return false;
 		}
 	}
@@ -99,7 +99,7 @@ function getValidTransferData(event, allowedTypes, strict) {
 				return null;
 			}
 		}
-	} catch(error) {
+	} catch(_error) {
 		return null;
 	}
 
@@ -175,15 +175,15 @@ function convertToValidDragObject(data, strict) {
 		});
 	}
 
-	if (data.hasOwnProperty('type') && isValidDragObject(data)) {
+	if (Object.prototype.hasOwnProperty.call(data, 'type') && isValidDragObject(data)) {
 		return data;
 	}
 
-	const found = Object.entries(TYPE_DEFINITION).find(([type, typedef]) => {
-		if (!data.hasOwnProperty(typedef.id))
+	const found = Object.entries(TYPE_DEFINITION).find(([ , typedef ]) => {
+		if (!Object.prototype.hasOwnProperty.call(data, typedef.id))
 			return false;
 		if (typedef.extras) {
-			if (!typedef.extras.every(extra => data.hasOwnProperty("extra")))
+			if (!typedef.extras.every(extra => Object.prototype.hasOwnProperty.call(data, extra)))
 				return false;
 		}
 		return true;
@@ -199,7 +199,7 @@ function convertToValidDragObject(data, strict) {
 	newData.type = type;
 	newData.id = data[typedef.id];
 	if (typedef.extras)
-		typedef.extras.forEach(extra => newData[extras] = data[extra]);
+		typedef.extras.forEach(extra => newData[extra] = data[extra]);
 
 	return newData;
 }

From 97f72caf90d7461248fb02cf8e108f99ebb12f1a Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 12 Sep 2025 02:02:31 +0200
Subject: [PATCH 046/101] Studierendenverwaltung Projektarbeiten: display of lv
 orgform only if present, hiding modal again after save, Betreuer can be
 edited after initial creation of Projektarbeit

---
 .../Details/Projektarbeit/Details.js          | 40 ++----------------
 .../Details/Projektarbeit/Projektarbeit.js    | 34 ++++++++++-----
 .../Details/Projektarbeit/Projektbetreuer.js  | 42 ++++++++++---------
 3 files changed, 50 insertions(+), 66 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index 35a4f5f8a..a51342c7c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -100,41 +100,7 @@ export default {
 			this.formData.anmerkung = null;
 			this.$refs.formDetails.clearValidation();
 		},
-		getFormData(statusNew, studiensemester_kurzbz, additional_lehrveranstaltung_id/*, successCallback*/) {
-
-			//~ let callArray = [
-				//~ this.$api.call(ApiStvProjektarbeit.getTypenProjektarbeit()),
-				//~ this.$api.call(ApiStvProjektarbeit.getLehrveranstaltungen(
-					//~ this.student.uid,
-					//~ projektarbeit_id ? null : this.student.studiengang_kz,
-					//~ studiensemester_kurzbz ?? this.defaultSemester,
-					//~ additional_lehrveranstaltung_id ?? null
-				//~ )),
-				//~ this.$api.call(ApiStvProjektarbeit.getNoten())
-			//~ ];
-
-			//~ if (projektarbeit_id) callArray.push(this.$api.call(ApiStvProjektarbeit.loadProjektarbeit(projektarbeit_id)));
-
-			//~ // Run when All promises are settled
-			//~ Promise.allSettled(callArray).then((results) => {
-				//~ let hasError = false;
-				//~ let allFormData = [];
-				//~ results.forEach((promise_result) => {
-
-					//~ if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
-						//~ allFormData.push(promise_result.value.data);
-					//~ } else {
-						//~ hasError = true;
-						//~ //this.$fhcAlert.handleSystemError(promise_result);
-					//~ }
-					//~ //let data = promise_result.value.data;
-				//~ });
-
-				//~ if (!hasError) {
-					//~ this.setFormData(allFormData[0], allFormData[1], allFormData[2], allFormData[3], allFormData[4] ?? null);
-					//~ if (successCallback) successCallback();
-				//~ }
-			//~ });
+		getFormData(statusNew, studiensemester_kurzbz, additional_lehrveranstaltung_id) {
 
 			this.$api
 				.call(ApiStvProjektarbeit.getTypenProjektarbeit())
@@ -162,6 +128,8 @@ export default {
 					this.arrNoten = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
+
+			if (statusNew) this.resetForm();
 		},
 		loadProjektarbeit(projektarbeit_id) {
 
@@ -316,7 +284,7 @@ export default {
 							:key="lv.lehrveranstaltung_id"
 							:value="lv.lehrveranstaltung_id"
 							>
-							{{lv.bezeichnung + ' ' + lv.orgform_kurzbz + ' (' + lv.semester + ' Sem) ID: ' + lv.lehrveranstaltung_id}}
+							{{lv.bezeichnung + (lv.orgform_kurzbz ? ' ' + lv.orgform_kurzbz : '') + ' (' + lv.semester + ' Sem) ID: ' + lv.lehrveranstaltung_id}}
 						</option>
 					</form-input>
 				</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index f78963066..d4f941e4b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -82,7 +82,6 @@ export default {
 				},
 			],
 			tabulatorData: [],
-			//lastSelected: null,
 			editedProjektarbeit: null,
 			statusNew: true,
 			studiensemester_kurzbz: null,
@@ -257,23 +256,19 @@ export default {
 	methods: {
 		actionNewProjektarbeit() {
 			this.statusNew = true;
+			this.editedProjektarbeit = null;
+			this.toggleMenu('details');
 			this.$refs.projektarbeitDetails.getFormData(this.statusNew);
 			this.$refs.projektarbeitModal.show();
 		},
 		actionEditProjektarbeit() {
 			this.statusNew = false;
 			this.toggleMenu('details');
-			this.$refs.projektarbeitDetails.getFormData(
-				this.statusNew, this.editedProjektarbeit.studiensemester_kurzbz, this.editedProjektarbeit.lehrveranstaltung_id
-			);
-			this.$refs.projektarbeitDetails.loadProjektarbeit(this.editedProjektarbeit.projektarbeit_id);
 			this.$refs.projektarbeitModal.show();
 		},
 		actionEditBetreuer() {
+			this.statusNew = false;
 			this.toggleMenu('betreuer');
-			this.$refs.projektbetreuer.getData(
-				this.editedProjektarbeit.projektarbeit_id, this.editedProjektarbeit.studiensemester_kurzbz, this.editedProjektarbeit.projekttyp_kurzbz
-			);
 			this.$refs.projektarbeitModal.show();
 		},
 		actionDeleteProjektarbeit(projektarbeit_id) {
@@ -313,6 +308,7 @@ export default {
 		projektarbeitSaved() {
 			this.reload();
 			this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+			this.hideModal('projektarbeitModal');
 		},
 		setDefaultStunden(projekttyp_kurzbz) {
 			this.$refs.projektbetreuer.setDefaultStunden(projekttyp_kurzbz);
@@ -325,6 +321,22 @@ export default {
 		},
 		toggleMenu(tabId) {
 			this.activeTab = tabId;
+			if (this.statusNew == false) {
+				switch(tabId) {
+					case 'details':
+						this.$refs.projektarbeitDetails.getFormData(
+							this.statusNew, this.editedProjektarbeit?.studiensemester_kurzbz, this.editedProjektarbeit?.lehrveranstaltung_id
+						);
+						this.$refs.projektarbeitDetails.loadProjektarbeit(this.editedProjektarbeit?.projektarbeit_id);
+						break;
+					case 'betreuer':
+						this.$refs.projektbetreuer.getFormData(
+							this.editedProjektarbeit ? this.editedProjektarbeit.projekttyp_kurzbz : null
+						);
+						this.$refs.projektbetreuer.getProjektbetreuer(this.editedProjektarbeit?.projektarbeit_id, this.editedProjektarbeit?.studiensemester_kurzbz);
+						break;
+				}
+			}
 		}
 	},
 	template: `
@@ -352,13 +364,13 @@ export default {
 				<p v-else class="fw-bold mt-3">{{$p.t('projektarbeit', 'projektarbeitBearbeiten')}}</p>
 			</template>
 
-			<template #modal-header-content>
+			<template #modal-header-content v-if="!statusNew">
 				<ul class="nav nav-tabs w-100 mt-3 msg_preview" id="pa_tabs" role="tablist">
 					<li class="nav-item" role="presentation">
-						<button class="nav-link" :class="activeTab == 'details' ? 'active' : ''" id="details-tab" data-bs-toggle="tab" data-bs-target="#details" type="button" role="tab" aria-controls="details" aria-selected="true" @click="actionEditProjektarbeit">Details</button>
+						<button class="nav-link" :class="activeTab == 'details' ? 'active' : ''" id="details-tab" data-bs-toggle="tab" data-bs-target="#details" type="button" role="tab" aria-controls="details" aria-selected="true" @click="toggleMenu('details')">Details</button>
 					</li>
 					<li class="nav-item" role="presentation">
-						<button class="nav-link" :class="activeTab == 'betreuer' ? 'active' : ''" id="betreuer-tab" data-bs-toggle="tab" data-bs-target="#betreuer" type="button" role="tab" aria-controls="betreuer" aria-selected="false" @click="actionEditBetreuer">{{$p.t('projektarbeit', 'betreuerGross')}}</button>
+						<button class="nav-link" :class="activeTab == 'betreuer' ? 'active' : ''" id="betreuer-tab" data-bs-toggle="tab" data-bs-target="#betreuer" type="button" role="tab" aria-controls="betreuer" aria-selected="false" @click="toggleMenu('betreuer')">{{$p.t('projektarbeit', 'betreuerGross')}}</button>
 					</li>
 				</ul>
 			</template>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 1290aa036..6ce9bca54 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -235,10 +235,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		getData(projektarbeit_id, studiensemester_kurzbz, projekttyp_kurzbz) {
-
-			this.studiensemester_kurzbz = studiensemester_kurzbz;
-
+		getFormData(projekttyp_kurzbz) {
 			// default Stundensätze from config
 			this.defaultFormDataValues.stunden = this.getDefaultStunden(projekttyp_kurzbz);
 			this.defaultFormDataValues.stundensatz = this.config.defaultProjektbetreuerStundensatz;
@@ -257,21 +254,25 @@ export default {
 					this.arrNoten = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-
-			if (projektarbeit_id) {
-				this.projektarbeit_id = projektarbeit_id;
-				this.getProjektbetreuer();
-			} else {
-				this.$refs.projektbetreuerTable.tabulator.setData([]);
-			}
 		},
-		getProjektbetreuer() {
-			this.$api
-				.call(ApiStvProjektbetreuer.getProjektbetreuer(this.projektarbeit_id))
-				.then(result => {
-					this.$refs.projektbetreuerTable.tabulator.replaceData(this.addIds(result.data));
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+		getProjektbetreuer(projektarbeit_id, studiensemester_kurzbz) {
+			if (projektarbeit_id) {
+				// if projektarbeit changed, reset the form to hold new data
+				if (this.projektarbeit_id != projektarbeit_id) {
+					this.resetForm();
+					this.resetModes();
+				}
+				this.projektarbeit_id = projektarbeit_id;
+				this.studiensemester_kurzbz = studiensemester_kurzbz;
+				this.$api
+					.call(ApiStvProjektbetreuer.getProjektbetreuer(this.projektarbeit_id))
+					.then(result => {
+						this.$refs.projektbetreuerTable.tabulator.replaceData(this.addIds(result.data));
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			} else {
+				this.emptyBetreuer();
+			}
 		},
 		saveProjektbetreuer() {
 			this.$refs.formProjektbetreuer.call(
@@ -279,7 +280,7 @@ export default {
 			)
 			.then(result => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-				this.getProjektbetreuer();
+				this.getProjektbetreuer(this.projektarbeit_id, this.studiensemester_kurzbz);
 				this.resetModes();
 			})
 			.catch(this.$fhcAlert.handleSystemError);
@@ -296,6 +297,9 @@ export default {
 					this.filteredBetreuer = result.data;
 				});
 		},
+		emptyBetreuer() {
+			this.$refs.projektbetreuerTable.tabulator.clearData();
+		},
 		resetForm() {
 			this.formData = this.getDefaultFormData();
 			if (this.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = '';

From 776222fd11174b1edec333865ee8782ec653976a Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 12 Sep 2025 13:52:21 +0200
Subject: [PATCH 047/101] bugfix Studierendenverwaltung Projektarbeiten:
 correct default Stunden at all times

---
 .../Details/Projektarbeit/Projektbetreuer.js              | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 6ce9bca54..8416dadd4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -361,7 +361,13 @@ export default {
 		setDefaultStunden(projekttyp_kurzbz) {
 			this.projekttyp_kurzbz = projekttyp_kurzbz;
 			// if form data has not already been modified by user, set the default stunden
-			if (!this.formDataModified()) this.formData.stunden = this.getDefaultStunden(projekttyp_kurzbz);
+			if (!this.formDataModified()) {
+				let defaultStunden = this.getDefaultStunden(projekttyp_kurzbz);
+				// adapt initial form data so it does not count as modified
+				if (this.initialFormData) this.initialFormData.stunden = defaultStunden;
+				// set default Stunden
+				this.formData.stunden = defaultStunden;
+			}
 		},
 		// check if form data has been modified since initial data has been captured
 		formDataModified() {

From 69a1e945b3a3b50bda35f3a1b934575c181470a4 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 16 Sep 2025 08:36:12 +0200
Subject: [PATCH 048/101] bug beim laden des messages tab ohne oe zuordnung

---
 .../api/frontend/v1/messages/Messages.php     | 41 ++++++++-----------
 .../api/frontend/v1/vorlagen/Vorlagen.php     | 14 ++++---
 .../Messages/Details/TableMessages.js         |  5 +++
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index fa6748f6a..006fe296b 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -52,11 +52,14 @@ class Messages extends FHCAPI_Controller
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 
-		$data = $this->getDataOrTerminateWithError($result);
+		if (hasData($result))
+		{
+			$data = getData($result);
+			$this->addMeta('count', $data['count']);
+			$this->terminateWithSuccess($data['data']);
+		}
 
-		$this->addMeta('count', $data['count']);
-
-		$this->terminateWithSuccess($data['data']);
+		$this->terminateWithSuccess(array());
 	}
 
 	public function getVorlagen()
@@ -66,32 +69,23 @@ class Messages extends FHCAPI_Controller
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
 
-		$data = $this->getDataOrTerminateWithError($result);
-		$oe_kurzbz = current($data);
+		if (hasData($result))
+		{
+			$this->load->model('system/Vorlage_model', 'VorlageModel');
 
-		$this->load->model('system/Vorlage_model', 'VorlageModel');
+			$data = getData($result);
 
-		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
-		$data = $this->getDataOrTerminateWithError($result);
+			$oe_kurzbz = array_column($data, 'oe_kurzbz');
+			$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz);
 
-		$this->terminateWithSuccess($data);
+			$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+		}
 
-		//If admin
-		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
-		$result = $this->VorlageModel->loadWhere(
-			array(
-				'mimetype' => 'text/html'
-			));
-
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess(array());
 	}
 
 	public function getVorlagentext($vorlage_kurzbz)
 	{
-		//$this->terminateWithError("vor " . $vorlage_kurzbz, self::ERROR_TYPE_GENERAL);
 		//$studiengang_kz = 227; //TODO(Manu) dynamisieren NULL
 		$studiengang_kz = 0;
 		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
@@ -108,7 +102,6 @@ class Messages extends FHCAPI_Controller
 		//not correct with Vorlage
 		$vorlage = current($data);
 
-		//$this->terminateWithSuccess($data);
 		$this->terminateWithSuccess($vorlage->text);
 	}
 
@@ -223,8 +216,6 @@ class Messages extends FHCAPI_Controller
 		}
 		elseif($typeId == 'prestudent_id')
 		{
-		//	$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
-
 			$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
 			$bodyParsed = $this->getDataOrTerminateWithError($result);
 		}
diff --git a/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php b/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php
index 01edb33d1..cf76746ef 100644
--- a/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php
+++ b/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php
@@ -51,13 +51,17 @@ class Vorlagen extends FHCAPI_Controller
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
 
-		$data = $this->getDataOrTerminateWithError($result);
-		$oe_kurzbz = current($data);
+		if (hasData($result))
+		{
+			$data = getData($result);
 
-		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
-		$data = $this->getDataOrTerminateWithError($result);
+			$oe_kurzbz = array_column($data, 'oe_kurzbz');
+			$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz);
+
+			$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+		}
+		$this->terminateWithSuccess(array());
 
-		$this->terminateWithSuccess($data);
 	}
 
 }
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 5095f4223..2a12128eb 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -274,6 +274,11 @@ export default {
 			this.$refs.table.reloadTable();
 		},
 		buildTreemap(messages) {
+			if (!messages || !messages.data || messages.data.length === 0)
+			{
+				return {data: [], last_page: 0};
+			}
+
 			const last_page = messages.meta.count;
 			messages = messages.data;
 			const messageMap = new Map();

From 651452d821c30f408c8c9b900520e1db7fd0b20d Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 16 Sep 2025 08:40:40 +0200
Subject: [PATCH 049/101] bug beim laden des status tabs ohne meldestichtag

---
 application/controllers/api/frontend/v1/stv/Status.php         | 3 +--
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 665fb620f..308e5cf0d 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -114,9 +114,8 @@ class Status extends FHCAPI_Controller
 		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
 
 		$result = $this->BismeldestichtagModel->getLastReachedMeldestichtag();
-		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
 	}
 
 	public function isLastStatus($prestudent_id)
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 593914916..9f55d26c2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -401,7 +401,7 @@ export default{
 		this.$api
 			.call(ApiStvPrestudent.getLastBismeldestichtag())
 			.then(result => {
-				this.dataMeldestichtag = result.data[0].meldestichtag;
+				this.dataMeldestichtag = result.data[0]?.meldestichtag;
 				if (this.$refs.table && this.$refs.table.tableBuilt)
 					this.$refs.table.tabulator.redraw(true);
 			})

From aca4195df637f363be2fa7a995634d2921d0fdf4 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 17 Sep 2025 11:01:08 +0200
Subject: [PATCH 050/101] stv kontaktieren tab hinzugefuegt

---
 .../api/frontend/v1/stv/Config.php            |   5 +
 .../Details/Kontaktieren.js                   | 101 +++++++++++++++
 system/phrasesupdate.php                      | 120 ++++++++++++++++++
 3 files changed, 226 insertions(+)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 2fb436384..da3c67b4a 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -227,6 +227,11 @@ class Config extends FHCAPI_Controller
 			]
 		];
 
+		$result['kontaktieren'] = [
+			'title' => $this->p->t('stv', 'tab_kontaktieren'),
+			'component' => './Stv/Studentenverwaltung/Details/Kontaktieren.js',
+		];
+
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
 		});
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
new file mode 100644
index 000000000..bd7554a47
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
@@ -0,0 +1,101 @@
+export default {
+	name: "Kontaktieren",
+	computed: {
+		internMails() {
+			if (this.modelValue.mail_intern)
+			{
+				return [this.modelValue.mail_intern];
+			}
+			return this.modelValue.map(e => e.mail_intern);
+		},
+		privateMails()
+		{
+			if (this.modelValue.mail_privat)
+			{
+				return [this.modelValue.mail_privat];
+			}
+			return this.modelValue.map(e => e.mail_privat);
+		},
+	},
+	props: {
+		modelValue: Object
+	},
+
+	methods: {
+		async splitMails(mails, event) {
+			let splititem = ",";
+			let maillist = mails.join(splititem);
+			let mailto = "";
+
+			if (maillist.length > 2024)
+			{
+				if (await this.$fhcAlert.confirm({message: this.$p.t('stv', 'zuvieleEMails') }) === false)
+					return;
+			}
+
+			let firstrun = true;
+			let useBcc = event?.ctrlKey || event?.metaKey;
+			while (maillist.length > 0)
+			{
+				if (maillist.length > 2024)
+				{
+					let splitposition = maillist.lastIndexOf(splititem, 1900);
+					mailto = maillist.substring(0, splitposition);
+					maillist = maillist.substring(splitposition + 1);
+				}
+				else
+				{
+					mailto = maillist;
+					maillist = "";
+				}
+
+				let mailLink = useBcc ? `mailto:?bcc=${mailto}` : `mailto:${mailto}`;
+
+				if (firstrun)
+				{
+					window.location.href = mailLink;
+					firstrun = false;
+				}
+				else
+				{
+					if (await this.$fhcAlert.confirm({message: this.$p.t('stv', 'weitereEMail')}) === true)
+					{
+						window.location.href = mailLink;
+					}
+				}
+
+			}
+		},
+		internMail(event) {
+			if (this.internMails.length)
+			{
+				this.splitMails(this.internMails, event);
+			}
+		},
+		privateMail(event) {
+			if (this.privateMails.length)
+			{
+				this.splitMails(this.privateMails, event);
+			}
+		}
+	},
+	template: `
+	<div>
+	<div id="elementID"></div>
+		<div class="row">
+			<div class="col-lg-2">
+				<button class="btn btn-primary mb-2" @click="internMail($event)" :title="$p.t('stv', 'bccEMail')">
+					<i class="fa-solid fa-mail"></i> {{$p.t('stv', 'internEMail')}}
+				</button>
+			</div>
+		</div>
+		
+		<div class="row">
+			<div class="col-lg-2">
+				<button class="btn btn-primary mb-2" @click="privateMail($event)" :title="$p.t('stv', 'bccEMail')">
+					<i class="fa-solid fa-mail"></i> {{$p.t('stv', 'privateEMail')}}
+				</button>
+			</div>
+		</div>
+	</div>`
+};
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 43e9c0fcc..5893efc61 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43075,6 +43075,126 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_kontaktieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontaktieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Get in Contact',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'internEMail',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'E-Mail senden (intern)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Send email (internal)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'privateEMail',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'E-Mail senden (privat)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Send email (private)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'bccEMail',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'STRG-Taste für BCC',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'CTRL-Key for BCC',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'weitereEMail',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ein weiteres Fenster wird geöffnet. Fortfahren?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'A new window will open. Continue?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'zuvieleEMails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufgrund der hohen Empfängerzahl muss die Nachricht auf mehrere E-Mails aufgeteilt werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Due to the large number of recipients, the message needs to be split across multiple emails.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abschlusspruefung',

From 566938d4f053b78e1748a208fb509a0c6bf2f5a1 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 18 Sep 2025 17:25:00 +0200
Subject: [PATCH 051/101] Studierendenverwaltung Abschlusspruefung: moved
 Vorsitz and Pruefer search to backend, searched by vorname or nachname or
 combinations of vorname and nachname

---
 .../api/frontend/v1/stv/Abschlusspruefung.php | 132 ++++++---------
 .../models/ressource/Mitarbeiter_model.php    |  14 +-
 .../js/api/factory/stv/abschlusspruefung.js   |  19 +--
 .../Abschlusspruefung/Abschlusspruefung.js    | 152 ++++++++++++------
 4 files changed, 162 insertions(+), 155 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
index d8bc067f9..def4f6502 100644
--- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -20,8 +20,6 @@ class Abschlusspruefung extends FHCAPI_Controller
 			'getBeurteilungen' => ['admin:rw', 'assistenz:rw'],
 			'getAkadGrade' => ['admin:rw', 'assistenz:rw'],
 			'getMitarbeiter' => ['admin:rw', 'assistenz:rw'],
-			'getAllMitarbeiter' => ['admin:rw', 'assistenz:rw'],
-			'getAllPersons' => ['admin:rw', 'assistenz:rw'],
 			'getPruefer' => ['admin:rw', 'assistenz:rw'],
 			'getTypStudiengang' => ['admin:rw', 'assistenz:rw'],
 			'checkForExistingExams' => ['admin:rw', 'assistenz:rw'],
@@ -102,35 +100,45 @@ class Abschlusspruefung extends FHCAPI_Controller
 	{
 		$abschlusspruefung_id = $this->input->post('id');
 
-		$this->AbschlusspruefungModel->addSelect('lehre.tbl_abschlusspruefung.*');
-		$this->AbschlusspruefungModel->addSelect("
-			CASE
-				WHEN pruefer1 IS NOT NULL
-				THEN CONCAT(p1.nachname, ' ', p1.vorname, COALESCE(' ' || p1.titelpre, ''))
-				ELSE NULL
-   			 END AS p1
-   		");
-		$this->AbschlusspruefungModel->addSelect("
-			CASE
-				WHEN pruefer2 IS NOT NULL
-				THEN CONCAT(p2.nachname, ' ', p2.vorname, COALESCE(' ' || p2.titelpre, ''))
-				ELSE NULL
-   			 END AS p2
-		");
-		$this->AbschlusspruefungModel->addSelect("
-			CASE
-				WHEN pruefer3 IS NOT NULL
-				THEN CONCAT(p3.nachname, ' ', p3.vorname, COALESCE(' ' || p3.titelpre, ''))
-				ELSE NULL
-   			 END AS p3
-		");
-		$this->AbschlusspruefungModel->addSelect("
-			CASE
-				WHEN vorsitz IS NOT NULL
-				THEN CONCAT(pv.nachname, ' ', pv.vorname, COALESCE(' ' || pv.titelpre, ''), ' (', ben.uid , ')' )
-				ELSE NULL
-   			 END AS pv
-		");
+		$this->AbschlusspruefungModel->addSelect(
+			'lehre.tbl_abschlusspruefung.*,
+			p1.person_id AS p1_person_id, p1.vorname AS p1_vorname, p1.nachname AS p1_nachname,
+			p1.titelpre AS p1_titelpre, p1.titelpost AS p1_titelpost,
+			p2.person_id AS p2_person_id, p2.vorname AS p2_vorname, p2.nachname AS p2_nachname,
+			p2.titelpre AS p2_titelpre, p2.titelpost AS p2_titelpost,
+			p3.person_id AS p3_person_id, p3.vorname AS p3_vorname, p3.nachname AS p3_nachname,
+			p3.titelpre AS p3_titelpre, p3.titelpost AS p3_titelpost,
+			pv.person_id AS pv_person_id, pv.vorname AS pv_vorname, pv.nachname AS pv_nachname,
+			pv.titelpre AS pv_titelpre, pv.titelpost AS pv_titelpost, ben.uid AS pv_uid'
+		);
+		//~ $this->AbschlusspruefungModel->addSelect("
+			//~ CASE
+				//~ WHEN pruefer1 IS NOT NULL
+				//~ THEN CONCAT(p1.nachname, ' ', p1.vorname, COALESCE(' ' || p1.titelpre, ''))
+				//~ ELSE NULL
+   			 //~ END AS p1
+   		//~ ");
+		//~ $this->AbschlusspruefungModel->addSelect("
+			//~ CASE
+				//~ WHEN pruefer2 IS NOT NULL
+				//~ THEN CONCAT(p2.nachname, ' ', p2.vorname, COALESCE(' ' || p2.titelpre, ''))
+				//~ ELSE NULL
+   			 //~ END AS p2
+		//~ ");
+		//~ $this->AbschlusspruefungModel->addSelect("
+			//~ CASE
+				//~ WHEN pruefer3 IS NOT NULL
+				//~ THEN CONCAT(p3.nachname, ' ', p3.vorname, COALESCE(' ' || p3.titelpre, ''))
+				//~ ELSE NULL
+   			 //~ END AS p3
+		//~ ");
+		//~ $this->AbschlusspruefungModel->addSelect("
+			//~ CASE
+				//~ WHEN vorsitz IS NOT NULL
+				//~ THEN CONCAT(pv.nachname, ' ', pv.vorname, COALESCE(' ' || pv.titelpre, ''), ' (', ben.uid , ')' )
+				//~ ELSE NULL
+   			 //~ END AS pv
+		//~ ");
 		$this->AbschlusspruefungModel->addJoin('public.tbl_benutzer ben', 'ON (ben.uid = lehre.tbl_abschlusspruefung.vorsitz)', 'LEFT');
 		$this->AbschlusspruefungModel->addJoin('public.tbl_person pv', 'ON (pv.person_id = ben.person_id)', 'LEFT');
 		$this->AbschlusspruefungModel->addJoin('public.tbl_person p1', 'ON (p1.person_id = lehre.tbl_abschlusspruefung.pruefer1)', 'LEFT');
@@ -220,8 +228,10 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->terminateWithSuccess($typStudiengang);
 	}
 
-	public function getMitarbeiter($searchString)
+	public function getMitarbeiter()
 	{
+		$searchString = $this->input->get('searchString') ?? '';
+
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'mitAkadGrad');
@@ -232,8 +242,10 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->terminateWithSuccess($result ?: []);
 	}
 
-	public function getPruefer($searchString)
+	public function getPruefer()
 	{
+		$searchString = $this->input->get('searchString') ?? '';
+
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'ohneMaUid');
@@ -444,58 +456,4 @@ class Abschlusspruefung extends FHCAPI_Controller
 		}
 		$this->terminateWithSuccess('step3');
 	}
-
-	/*
-	* returns list of all Mitarbeiter
-	* as key value list to be used in select or autocomplete
-	*/
-	public function getAllMitarbeiter()
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
-		$sql = "
-			SELECT
-			    ma.mitarbeiter_uid as mitarbeiter_uid,
-				CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid, ')') as label
-			FROM
-			  public.tbl_mitarbeiter ma
-			  JOIN public.tbl_benutzer bn ON (bn.uid = ma.mitarbeiter_uid)
-			  JOIN public.tbl_person p ON (p.person_id = bn.person_id)
-			ORDER BY
-			p.nachname ASC
-			";
-
-		$result = $this->MitarbeiterModel->execReadOnlyQuery($sql);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	/*
-	* returns list of all Persons
-	* as key value list to be used in select or autocomplete
-	*/
-	public function getAllPersons()
-	{
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		$sql = "
-			SELECT
-			    p.vorname, p.nachname, p.person_id,
-				CONCAT(p.nachname, ' ', p.vorname) as label
-			FROM
-			  public.tbl_person p
-			 -- JOIN public.tbl_benutzer bn ON (p.person_id = bn.person_id)
-			  -- and bn.aktiv = 'true'
-			ORDER BY
-			p.nachname ASC
-			";
-
-		//TODO(manu) check if filter active benutzer
-
-		$result = $this->PersonModel->execReadOnlyQuery($sql);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
 }
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index bf4672070..0dad7443e 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -353,12 +353,14 @@ class Mitarbeiter_model extends DB_Model
 	{
 		$filter = strtoLower($filter);
 
+		$returnwert = "p.person_id, p.nachname, p.vorname, p.titelpost,  p.titelpre";
+
 		if ($mode == "mitAkadGrad")
-			$returnwert = "ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
+			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
 		elseif ($mode == "ohneMaUid")
-			$returnwert = "p.person_id, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre) as mitarbeiter";
+			$returnwert .= ", p.person_id, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre) as mitarbeiter";
 		else
-			$returnwert = "ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
+			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
 
 		$qry = "
 			SELECT " . $returnwert . "  
@@ -373,7 +375,11 @@ class Mitarbeiter_model extends DB_Model
 			OR
 				lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%'
 			OR
-				(ma.mitarbeiter_uid) LIKE '%". $this->db->escape_like_str($filter)."%'";
+				(ma.mitarbeiter_uid) LIKE '%". $this->db->escape_like_str($filter)."%'
+			OR
+				lower(vorname || ' ' || nachname || ' ' || vorname) like ".$this->db->escape('%'.mb_strtolower($filter).'%')."
+			ORDER BY
+				p.nachname, p.vorname, b.uid, p.person_id";
 
 		return $this->execQuery($qry);
 	}
diff --git a/public/js/api/factory/stv/abschlusspruefung.js b/public/js/api/factory/stv/abschlusspruefung.js
index db8403b48..dcba61887 100644
--- a/public/js/api/factory/stv/abschlusspruefung.js
+++ b/public/js/api/factory/stv/abschlusspruefung.js
@@ -86,13 +86,15 @@ export default {
 	getMitarbeiter(searchString) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/abschlusspruefung/getMitarbeiter/' + searchString
+			url: 'api/frontend/v1/stv/abschlusspruefung/getMitarbeiter',
+			params: { searchString }
 		};
 	},
 	getPruefer(searchString) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/abschlusspruefung/getPruefer/' + searchString
+			url: 'api/frontend/v1/stv/abschlusspruefung/getPruefer',
+			params: { searchString }
 		};
 	},
 	getNoten() {
@@ -108,16 +110,11 @@ export default {
 			params: { uids }
 		};
 	},
-	getAllMitarbeiter(){
+	searchPerson(searchString) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/abschlusspruefung/getAllMitarbeiter/'
+			url: 'api/frontend/v1/stv/abschlusspruefung/searchPerson/',
+			params: { id }
 		};
 	},
-	getAllPersons(){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/stv/abschlusspruefung/getAllPersons/'
-		};
-	}
-};
\ No newline at end of file
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index e5c4cade1..b8f4ee11b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -260,14 +260,16 @@ export default {
 			arrAkadGrad: [],
 			arrNoten: [],
 			selectedVorsitz: null,
-			listeFilteredMitarbeiter: [],
-			listeAllMitarbeiter: [],
-			listeAllPersons: [],
+			filteredMitarbeiter: [],
+			filteredPersons: [],
 			selectedPruefer1: null,
 			selectedPruefer2: null,
 			selectedPruefer3: null,
-			listeFilteredPersons: [],
-			stgInfo: { typ: '', oe_kurzbz: '' }
+			stgInfo: { typ: '', oe_kurzbz: '' },
+			abortController: {
+				mitarbeiter: null,
+				persons: null
+			},
 		}
 	},
 	watch: {
@@ -307,23 +309,39 @@ export default {
 		actionEditAbschlusspruefung(abschlusspruefung_id) {
 			this.resetForm();
 			this.statusNew = false;
-			this.loadAbschlusspruefung(abschlusspruefung_id).then(() => {
+			this.loadAbschlusspruefung(abschlusspruefung_id).then((result) => {
 				//set selectedData to enable viewing label in primevue autocomplete fields
-				this.selectedVorsitz = this.listeAllMitarbeiter.find(
-					item => item.mitarbeiter_uid === this.formData.vorsitz
-				);
-				this.selectedPruefer1 = this.listeAllPersons.find(
-					item => item.person_id === this.formData.pruefer1
-				);
-				this.selectedPruefer2= this.listeAllPersons.find(
-					item => item.person_id === this.formData.pruefer2
-				);
-				this.selectedPruefer3= this.listeAllPersons.find(
-					item => item.person_id === this.formData.pruefer3
-				);
+				const data = result.data;
+				this.selectedVorsitz = {
+					label: this.getPersonLabel(data.pv_titelpre, data.pv_nachname, data.pv_vorname, data.pv_titelpost, data.pv_uid),
+					person_id: data.pv_person_id,
+					mitarbeiter_uid: data.pv_uid
+				};
+				if (data.p1_person_id) {
+					this.selectedPruefer1 = {
+						label: this.getPersonLabel(data.p1_titelpre, data.p1_nachname, data.p1_vorname, data.p1_titelpost),
+						person_id: data.p1_person_id
+					};
+				}
+				if (data.p2_person_id) {
+					this.selectedPruefer2 = {
+						label: this.getPersonLabel(data.p2_titelpre, data.p2_nachname, data.p2_vorname, data.p2_titelpost),
+						person_id: data.p2_person_id
+					}
+				};
+				if (data.p3_person_id) {
+					this.selectedPruefer3= {
+						label: this.getPersonLabel(data.p3_titelpre, data.p3_nachname, data.p3_vorname, data.p3_titelpost),
+						person_id: data.p3_person_id
+					};
+				}
 			});
 			this.$refs.finalexamModal.show();
 		},
+		getPersonLabel(titelpre, nachname, vorname, titelpost, uid) {
+			return nachname + ' ' + vorname + (titelpre ? ' ' + titelpre : '') + (titelpost ? ' ' + titelpost : '') + (uid ? ' (' + uid + ')' : '');
+				
+		},
 		actionDeleteAbschlusspruefung(abschlusspruefung_id) {
 			this.$fhcAlert
 				.confirmDelete()
@@ -439,22 +457,61 @@ export default {
 		printDocument(link) {
 			window.open(link, '_blank');
 		},
-		filterMitarbeiter(event){
-			const query = event?.query?.toLowerCase()?.trim() || "";
+		searchMitarbeiter(event) {
+			if (this.abortController.mitarbeiter) {
+				this.abortController.mitarbeiter.abort();
+			}
 
-			this.listeFilteredMitarbeiter = this.listeAllMitarbeiter.filter(item => {
-				const label = (item.label || "").toLowerCase();
-				return label.includes(query);
-			});
+			this.abortController.mitarbeiter = new AbortController();
+
+			return this.$api
+				.call(ApiStvAbschlusspruefung.getMitarbeiter(event.query))
+				.then(result => {
+					this.filteredMitarbeiter = [];
+					for (let mitarbeiter of result.data.retval) {
+						this.filteredMitarbeiter.push(
+							{
+								label: this.getPersonLabel(
+									mitarbeiter.titelpre,
+									mitarbeiter.nachname,
+									mitarbeiter.vorname,
+									mitarbeiter.titelpost,
+									mitarbeiter.mitarbeiter_uid
+								),
+								person_id: mitarbeiter.person_id,
+								mitarbeiter_uid: mitarbeiter.mitarbeiter_uid
+							}
+						);
+					}
+				});
 		},
-		filterPersons(event){
-			const query = event?.query?.toLowerCase()?.trim() || "";
+		searchPerson(event) {
+			if (this.abortController.persons) {
+				this.abortController.persons.abort();
+			}
 
-			this.listeFilteredPersons = this.listeAllPersons.filter(item => {
-				const label = (item.label || "").toLowerCase();
-				return label.includes(query);
-			});
-		}
+			this.abortController.persons = new AbortController();
+
+			return this.$api
+				.call(ApiStvAbschlusspruefung.getPruefer(event.query))
+				.then(result => {
+					this.filteredPersons = [];
+					for (let person of result.data.retval) {
+						this.filteredPersons.push(
+							{
+								label: this.getPersonLabel(
+									person.titelpre,
+									person.nachname,
+									person.vorname,
+									person.titelpost,
+									person.person_uid
+								),
+								person_id: person.person_id
+							}
+						);
+					}
+				});
+		},
 	},
 	created() {
 		this.$api
@@ -492,20 +549,6 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$api
-			.call(ApiStvAbschlusspruefung.getAllMitarbeiter())
-			.then(result => {
-				this.listeAllMitarbeiter = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiStvAbschlusspruefung.getAllPersons())
-			.then(result => {
-				this.listeAllPersons = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
 		if (!this.student.length) {
 			this.$api
 				.call(ApiStudiengang.getStudiengangByKz(this.student.studiengang_kz))
@@ -623,8 +666,8 @@ export default {
 						optionValue="mitarbeiter_uid"
 						dropdown
 						forceSelection
-						:suggestions="listeFilteredMitarbeiter"
-						@complete="filterMitarbeiter"
+						:suggestions="filteredMitarbeiter"
+						@complete="searchMitarbeiter"
 						:min-length="3"
 					>
 					</form-input>
@@ -636,9 +679,10 @@ export default {
 						v-model="selectedPruefer1"
 						optionLabel="label"
 						optionValue="person_id"
+						dropdown
 						forceSelection
-						:suggestions="listeFilteredPersons"
-						@complete="filterPersons"
+						:suggestions="filteredPersons"
+						@complete="searchPerson"
 						:min-length="3"
 					>
 					</form-input>
@@ -669,9 +713,10 @@ export default {
 						v-model="selectedPruefer2"
 						optionLabel="label"
 						optionValue="person_id"
+						dropdown
 						forceSelection
-						:suggestions="listeFilteredPersons" 
-						@complete="filterPersons"
+						:suggestions="filteredPersons" 
+						@complete="searchPerson"
 						:min-length="3"
 					>
 					</form-input>
@@ -701,9 +746,10 @@ export default {
 						v-model="selectedPruefer3"
 						optionLabel="label"
 						optionValue="person_id"
+						dropdown
 						forceSelection
-						:suggestions="listeFilteredPersons" 
-						@complete="filterPersons"
+						:suggestions="filteredPersons" 
+						@complete="searchPerson"
 						:min-length="3"
 					>
 					</form-input>

From d062e8903f3453c0730a9e000f6813f592278c12 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 19 Sep 2025 11:29:08 +0200
Subject: [PATCH 052/101] Mitarbeiter model searchMitarbeiter method: removed
 redundant person id

---
 application/models/ressource/Mitarbeiter_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 0dad7443e..a50112761 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -358,7 +358,7 @@ class Mitarbeiter_model extends DB_Model
 		if ($mode == "mitAkadGrad")
 			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
 		elseif ($mode == "ohneMaUid")
-			$returnwert .= ", p.person_id, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre) as mitarbeiter";
+			$returnwert .= ", CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre) as mitarbeiter";
 		else
 			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
 

From a533294121fe0ba95ca5b0253d7fd26c86b60c38 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 22 Sep 2025 15:54:26 +0200
Subject: [PATCH 053/101] removed addMeta in Student.php Studierendenverwaltung

---
 application/controllers/api/frontend/v1/stv/Student.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 122bbb4c8..d1f259cc4 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -460,8 +460,6 @@ class Student extends FHCAPI_Controller
 			$_POST['ausbildungssemester'] = 0;
 		}
 
-		$this->addMeta('test', $_POST['personOnly']);
-
 		$this->load->library('form_validation');
 
 		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [

From 3f0f48a4e088760766561b308eed047ae00bc68b Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 22 Sep 2025 17:34:50 +0200
Subject: [PATCH 054/101] Student.php: bracket bugfix, return person id of
 added Personinstead of true, Studierendenverwaltung Projektarbeit phrases

---
 application/controllers/api/frontend/v1/stv/Student.php   | 8 +++++---
 .../Details/Projektarbeit/Projektbetreuer.js              | 2 +-
 system/phrasesupdate.php                                  | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index d1f259cc4..23a8fc7cb 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -513,7 +513,9 @@ class Student extends FHCAPI_Controller
 		if ($this->db->trans_status() === FALSE)
 			$this->terminateWithError('TODO(chris): TEXT', self::ERROR_TYPE_GENERAL);
 
-		$this->terminateWithSuccess($result);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 
 	protected function addInteressent()
@@ -695,7 +697,7 @@ class Student extends FHCAPI_Controller
 				//Studentendatensatz anlegen
 				//StudentLehrverband anlegen
 			}
-
+		}
 		// TODO(chris): DEBUG
 		/*$result = $this->PrestudentModel->loadWhere([
 			'pestudent_id' => 1
@@ -704,7 +706,7 @@ class Student extends FHCAPI_Controller
 			return $result;
 		}*/
 
-		return success(true);
+		return success($person_id);
 	}
 
 	public function requiredIfNotPersonId($value)
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 8416dadd4..adcf2f2a8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -391,7 +391,7 @@ export default {
 		// stuff to do after new person has been saved
 		personSaved(result) {
 			this.$api
-				.call(ApiStvProjektbetreuer.getPerson(result.person_id))
+				.call(ApiStvProjektbetreuer.getPerson(result))
 				.then(response => {
 					// set the new person in Betreuer autocomplete field
 					this.autocompleteSelectedBetreuer = response.data;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 41cf4c9cf..97b556239 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -49801,7 +49801,7 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Projektbetreuer ungültig',
+				'text' => 'ProjektbetreuerIn ungültig',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -49821,7 +49821,7 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Löschen nicht möglich, Projektbetreuer hat bereits einen Vertrag',
+				'text' => 'Löschen nicht möglich, ProjektbetreuerIn hat bereits einen Vertrag',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -50261,7 +50261,7 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Betreuer bearbeiten',
+				'text' => 'BetreuerIn bearbeiten',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -50281,7 +50281,7 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Betreuer speichern',
+				'text' => 'BetreuerIn speichern',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 6abdb25c0a40d83498c690c4133cf9a305b3fc39 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 24 Sep 2025 09:33:41 +0200
Subject: [PATCH 055/101] abort controller fixed und index auf
 campus.tbl_studierendenantrag_status.studierendenantrag_id hinzugefuegt

---
 public/js/api/factory/studstatus/leitung.js   |  2 +-
 .../Studierendenantrag/Leitung/Actions/New.js | 28 +++++++------------
 system/dbupdate_3.4.php                       |  1 +
 ...udstatus_suche_abort_controller_haengt.php | 16 +++++++++++
 4 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 system/dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php

diff --git a/public/js/api/factory/studstatus/leitung.js b/public/js/api/factory/studstatus/leitung.js
index cc6b87d25..7f6bc9f54 100644
--- a/public/js/api/factory/studstatus/leitung.js
+++ b/public/js/api/factory/studstatus/leitung.js
@@ -34,7 +34,7 @@ export default {
 			url: '/api/frontend/v1/studstatus/leitung/getHistory/' + antrag_id
 		};
 	},
-	getPrestudents(query, signal) {
+	getPrestudents(query) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/studstatus/leitung/getPrestudents',
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index a6cd69219..f78455baa 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -37,16 +37,16 @@ export default {
 			});
 		},
 		loadData(evt) {
-                        if( evt.query.length < 2 )
-                        {
-                            return false;
-                        }
+			if (evt.query.length < 2)
+			{
+				return false;
+			}
+
+			if (this.abortController)
+			{
+				this.abortController.abort();
+			}
 
-			if (this.abortController instanceof AbortController
-                            && this.abortController.signal.aborted === false)
-                        {
-                            this.abortController.abort();
-                        }
 			this.abortController = new AbortController();
 
 			this.$api
@@ -56,16 +56,8 @@ export default {
 				})
 				.then(result => {
 					this.data = result.data;
-                                        this.abortController = null;
 				})
-				.catch(error => {
-                                    if (this.abortController instanceof AbortController 
-                                        && this.abortController.signal.aborted === false)
-                                    {
-                                        this.abortController.abort();
-                                    }
-                                    this.$fhcAlert.handleSystemError(error);
-                                });
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	template: `
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 4b52b04c4..7b298df36 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -79,6 +79,7 @@ require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
 require_once('dbupdate_3.4/40128_search.php');
 require_once('dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php');
 require_once('dbupdate_3.4/66982_berufsschule.php');
+require_once('dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php b/system/dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php
new file mode 100644
index 000000000..4c348a7ab
--- /dev/null
+++ b/system/dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php
@@ -0,0 +1,16 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add index to campus.tbl_studierendenantrag_status.studierendenantrag_id
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_studierendenantrag_status_studierendenantrag_id'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_studierendenantrag_status_studierendenantrag_id ON campus.tbl_studierendenantrag_status USING btree (studierendenantrag_id)";
+
+		if (!$db->db_query($qry))
+			echo '<strong>Indizes: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index fuer campus.tbl_studierendenantrag_status.studierendenantrag_id hinzugefuegt';
+	}
+}

From 0f43e8eb7aea87235c8b22dfc0d191d19f0b4691 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 24 Sep 2025 14:27:01 +0200
Subject: [PATCH 056/101] autocomplete auf backend umgestellt textarea
 formattedAnmerkung rausgenommen ui angepasst

---
 .../controllers/api/frontend/v1/lv/Gruppe.php |  70 +++++-
 .../controllers/api/frontend/v1/lv/Lektor.php |  26 ++-
 .../controllers/api/frontend/v1/lv/Tags.php   |   2 +-
 application/libraries/LektorLib.php           |  12 +-
 .../education/Lehreinheitgruppe_model.php     |   4 +-
 public/js/api/lehrveranstaltung/gruppe.js     |  10 +-
 public/js/api/lehrveranstaltung/lektor.js     |   5 +-
 .../LVVerwaltung/Details/Direktinskription.js |  44 ++--
 .../components/LVVerwaltung/Details/Form.js   |  12 +-
 .../LVVerwaltung/Details/Gruppen.js           |  50 +++--
 .../components/LVVerwaltung/LVVerwaltung.js   |  49 +++--
 .../components/LVVerwaltung/Lektor/Daten.js   |  89 +++++---
 .../components/LVVerwaltung/Lektor/Table.js   |  44 ++--
 .../components/LVVerwaltung/Lektor/Vertrag.js |  57 ++---
 .../js/components/LVVerwaltung/Setup/Table.js |   4 +-
 .../Stv/Studentenverwaltung/Verband.js        |   3 +
 system/phrasesupdate.php                      | 200 ++++++++++++++++++
 17 files changed, 509 insertions(+), 172 deletions(-)

diff --git a/application/controllers/api/frontend/v1/lv/Gruppe.php b/application/controllers/api/frontend/v1/lv/Gruppe.php
index 83a4fb696..a573c3ea3 100644
--- a/application/controllers/api/frontend/v1/lv/Gruppe.php
+++ b/application/controllers/api/frontend/v1/lv/Gruppe.php
@@ -12,8 +12,8 @@ class Gruppe extends FHCAPI_Controller
 			'add' => ['admin:rw', 'assistenz:rw'],
 			'delete' => ['admin:rw', 'assistenz:rw'],
 			'deleteFromLVPlan' => ['admin:rw', 'assistenz:rw'],
-			'getBenutzer' => ['admin:r', 'assistenz:r'],
-			'getAll' => ['admin:r', 'assistenz:r'],
+			'getBenutzerSearch' => ['admin:r', 'assistenz:r'],
+			'getAllSearch' => ['admin:r', 'assistenz:r'],
 			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
 		]);
 
@@ -22,7 +22,8 @@ class Gruppe extends FHCAPI_Controller
 		$this->_ci->load->library('PhrasesLib');
 		$this->loadPhrases(
 			array(
-				'ui'
+				'ui',
+				'lehre'
 			)
 		);
 
@@ -91,11 +92,11 @@ class Gruppe extends FHCAPI_Controller
 		$lehreinheitgruppe_id = $this->input->post('lehreinheitgruppe_id');
 
 		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id) || is_null($lehreinheitgruppe_id) || !ctype_digit((string)$lehreinheitgruppe_id))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$lehreinheitgruppe_result = $this->_ci->LehreinheitgruppeModel->loadWhere(array('lehreinheitgruppe_id' => $lehreinheitgruppe_id));
 		if (!hasData($lehreinheitgruppe_result) || isError($lehreinheitgruppe_result))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$this->checkPermission($lehreinheit_id);
 
@@ -108,15 +109,30 @@ class Gruppe extends FHCAPI_Controller
 	}
 
 
-	public function getAll()
+	public function getAllSearch($query = null)
 	{
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+		$query_words = explode(' ', urldecode($query));
+
 		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
 											studiengang_kz,
 											semester,
 											bezeichnung,
 											gid,
 											\'false\' as lehrverband');
-		$gruppen_result = $this->_ci->GruppeModel->loadWhere(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
+		$this->_ci->GruppeModel->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
+		$this->_ci->GruppeModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->GruppeModel->db->group_start();
+			$this->_ci->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->group_end();
+		}
+		$this->_ci->GruppeModel->db->group_end();
+
+		$gruppen_result = $this->_ci->GruppeModel->load();
 
 		$gruppen_array = array();
 
@@ -135,7 +151,18 @@ class Gruppe extends FHCAPI_Controller
 		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
 		$this->_ci->LehrverbandModel->addOrder('verband');
 		$this->_ci->LehrverbandModel->addOrder('gruppe');
-		$lehrverband_result = $this->_ci->LehrverbandModel->loadWhere(array('tbl_lehrverband.aktiv' => true));
+		$this->_ci->LehrverbandModel->db->where(array('tbl_lehrverband.aktiv' => true));
+
+		$this->_ci->LehrverbandModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->LehrverbandModel->db->group_start();
+			$this->_ci->LehrverbandModel->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->group_end();
+		}
+		$this->_ci->LehrverbandModel->db->group_end();
+		$lehrverband_result = $this->_ci->LehrverbandModel->load();
 
 		$lehrverband_array = array();
 
@@ -150,15 +177,38 @@ class Gruppe extends FHCAPI_Controller
 		$this->terminateWithSuccess($all_gruppen);
 	}
 
-	public function getBenutzer()
+	public function getBenutzerSearch($query = null)
 	{
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', urldecode($query));
+
 		$this->_ci->PersonModel->addSelect('vorname, nachname, uid, semester, UPPER(CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz)) as studiengang');
 		$this->_ci->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
 		$this->_ci->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid', 'LEFT');
 		$this->_ci->PersonModel->addJoin('public.tbl_student', 'uid = student_uid', 'LEFT');
 		$this->_ci->PersonModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
 
-		$personen = $this->_ci->PersonModel->loadWhere(array('tbl_benutzer.aktiv' => true));
+		$this->_ci->PersonModel->db->where(array('tbl_benutzer.aktiv' => true));
+
+		$this->_ci->PersonModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->PersonModel->db->group_start();
+			$this->_ci->PersonModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
+			$this->_ci->PersonModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
+			$this->_ci->PersonModel->db->or_where('uid ILIKE', "%" . $word . "%");
+			$this->_ci->PersonModel->db->or_where('CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz) ILIKE', "%" . $word . "%");
+
+			if (is_numeric($word))
+			{
+				$this->_ci->PersonModel->db->or_where('semester', $word);
+			}
+			$this->_ci->PersonModel->db->group_end();
+		}
+		$this->_ci->PersonModel->db->group_end();
+		$personen = $this->_ci->PersonModel->load();
 		$this->terminateWithSuccess(hasData($personen) ? getData($personen) : array());
 	}
 
diff --git a/application/controllers/api/frontend/v1/lv/Lektor.php b/application/controllers/api/frontend/v1/lv/Lektor.php
index 68bec1bc4..ccdc79133 100644
--- a/application/controllers/api/frontend/v1/lv/Lektor.php
+++ b/application/controllers/api/frontend/v1/lv/Lektor.php
@@ -15,7 +15,7 @@ class Lektor extends FHCAPI_Controller
 			'deleteLVPlan' => ['admin:rw', 'assistenz:rw'],
 			'deletePerson' => ['admin:rw', 'assistenz:rw'],
 			'getLehrfunktionen' => ['admin:r', 'assistenz:r'],
-			'getLektoren' => ['admin:r', 'assistenz:r'],
+			'getLektorenSearch' => ['admin:r', 'assistenz:r'],
 			'getLektorenByLE' => ['admin:r', 'assistenz:r'],
 			'getLektorDaten' => ['admin:r', 'assistenz:r'],
 			'getLektorVertrag' => ['admin:r', 'assistenz:r'],
@@ -208,12 +208,32 @@ class Lektor extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($this->_ci->LehrfunktionModel->load()));
 	}
 
-	public function getLektoren()
+	public function getLektorenSearch($query = null)
 	{
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+		$query_words = explode(' ', urldecode($query));
+
 		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
 		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
 		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
-		$this->terminateWithSuccess(getData($this->_ci->MitarbeiterModel->loadWhere(array('public.tbl_benutzer.aktiv' => true))));
+
+		$this->_ci->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
+
+		$this->_ci->MitarbeiterModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->MitarbeiterModel->db->group_start();
+			$this->_ci->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->group_end();
+		}
+		$this->_ci->MitarbeiterModel->db->group_end();
+		$this->_ci->MitarbeiterModel->addOrder('nachname');
+		$this->_ci->MitarbeiterModel->addOrder('vorname');
+		$result = $this->_ci->MitarbeiterModel->load();
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
 	}
 
 	private function checkLehreinheit($lehreinheit_id)
diff --git a/application/controllers/api/frontend/v1/lv/Tags.php b/application/controllers/api/frontend/v1/lv/Tags.php
index a22a4c82e..34c42bc32 100644
--- a/application/controllers/api/frontend/v1/lv/Tags.php
+++ b/application/controllers/api/frontend/v1/lv/Tags.php
@@ -5,7 +5,7 @@ if (!defined('BASEPATH'))
 
 class Tags extends Tag_Controller
 {
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
+	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:r'];
 
 	public function __construct()
 	{
diff --git a/application/libraries/LektorLib.php b/application/libraries/LektorLib.php
index e06e2b728..bbe630eaf 100644
--- a/application/libraries/LektorLib.php
+++ b/application/libraries/LektorLib.php
@@ -17,6 +17,7 @@ class LektorLib
 		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 		$this->_ci->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->_ci->load->library('PhrasesLib', array('lehre'));
 	}
 
 	public function addLektorToLehreinheit($lehreinheit_id, $mitarbeiter_uid)
@@ -35,7 +36,7 @@ class LektorLib
 
 		if (isError($already_assigned)) return $already_assigned;
 
-		if (hasData($already_assigned)) return error('Lektor already assigned');
+		if (hasData($already_assigned)) return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));
 
 		$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz' => $lehreinheit->studiensemester_kurzbz));
 		if (isError($studiensemester_result)) return $studiensemester_result;
@@ -88,6 +89,7 @@ class LektorLib
 
 		$lehreinheit = getData($lehreinheit_result)[0];
 
+
 		//TODO kollision check, wird vorerst nicht implementiert -> nur über das FAS möglich
 		if (isset($new_data['mitarbeiter_uid']) && $new_data['mitarbeiter_uid'] !== $mitarbeiter_uid)
 		{
@@ -98,7 +100,13 @@ class LektorLib
 			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
 
 			if (hasData($verplant))
-				return error('Wechsel vom Mitarbeiter nicht möglich da er bereits verplant ist!');
+				return error($this->_ci->phraseslib->t("lehre", "lektorbereitsverplant"));
+
+			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_data['mitarbeiter_uid'], 'lehreinheit_id' => $lehreinheit_id));
+
+			if (hasData($lehreinheit_data))
+				return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));
+
 		}
 		$warning = '';
 		if (isset($new_data['semesterstunden']))
diff --git a/application/models/education/Lehreinheitgruppe_model.php b/application/models/education/Lehreinheitgruppe_model.php
index bca395f31..dee8bbfe1 100644
--- a/application/models/education/Lehreinheitgruppe_model.php
+++ b/application/models/education/Lehreinheitgruppe_model.php
@@ -374,7 +374,7 @@ class Lehreinheitgruppe_model extends DB_Model
 			return success('Group assigned successfully to Lehreinheit');
 		}
 		else
-			return error('Group already assigned');
+			return error($this->p->t('lehre', 'grpbereitszugeteilt'));
 	}
 
 	public function deleteGroup($lehreinheit_id, $lehreinheitgruppe_id)
@@ -401,7 +401,7 @@ class Lehreinheitgruppe_model extends DB_Model
 		$stundenplan_result = $this->loadWhere(array('tbl_lehreinheitgruppe.lehreinheitgruppe_id' => $lehreinheitgruppe_id));
 
 		if (hasData($stundenplan_result))
-			return error('Gruppe already verplant');
+			return error($this->p->t('lehre', 'grpbereitsverplant'));
 
 		$delete_result = $this->delete($lehreinheitgruppe_id);
 
diff --git a/public/js/api/lehrveranstaltung/gruppe.js b/public/js/api/lehrveranstaltung/gruppe.js
index e22fdd847..386938160 100644
--- a/public/js/api/lehrveranstaltung/gruppe.js
+++ b/public/js/api/lehrveranstaltung/gruppe.js
@@ -37,20 +37,20 @@ export default {
 
 
 /*------------- details -------- */
-	getAll()
+	getBenutzerSearch(query)
 	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/lv/gruppe/getAll/'
+			url: '/api/frontend/v1/lv/gruppe/getBenutzerSearch/' + encodeURIComponent(query)
 		};
 	},
 
-	getBenutzer()
+	getAllSearch(query)
 	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/lv/gruppe/getBenutzer/'
+			url: '/api/frontend/v1/lv/gruppe/getAllSearch/'  + encodeURIComponent(query)
 		};
-	}
+	},
 
 }
diff --git a/public/js/api/lehrveranstaltung/lektor.js b/public/js/api/lehrveranstaltung/lektor.js
index e8c2fb673..9539315aa 100644
--- a/public/js/api/lehrveranstaltung/lektor.js
+++ b/public/js/api/lehrveranstaltung/lektor.js
@@ -8,12 +8,11 @@ export default {
 		};
 	},
 
-
-	getLektoren()
+	getLektorenSearch(query)
 	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/lv/lektor/getLektoren/'
+			url: '/api/frontend/v1/lv/lektor/getLektorenSearch/' + encodeURIComponent(query)
 		};
 	},
 
diff --git a/public/js/components/LVVerwaltung/Details/Direktinskription.js b/public/js/components/LVVerwaltung/Details/Direktinskription.js
index c7b8e5894..268b1bf28 100644
--- a/public/js/components/LVVerwaltung/Details/Direktinskription.js
+++ b/public/js/components/LVVerwaltung/Details/Direktinskription.js
@@ -2,6 +2,7 @@ import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
 import FormInput from '../../Form/Input.js';
 import ApiDirektGruppe from "../../../api/lehrveranstaltung/direktgruppe.js";
+import ApiGruppe from "../../../api/lehrveranstaltung/gruppe.js";
 export default{
 	name: "LVDirektGruppen",
 	components: {
@@ -65,7 +66,6 @@ export default{
 			selectedUser: null,
 			filteredUsers: [],
 			abortController: null,
-			searchTimeout: null,
 		}
 	},
 	watch: {
@@ -97,18 +97,36 @@ export default{
 		},
 		searchUser(event)
 		{
-			const query = event.query.toLowerCase().trim();
-			this.filteredUsers = this.dropdowns.benutzer_array.filter(user => {
+			const query = event.query.trim();
+			if (!query)
+			{
+				this.filteredUsers = [];
+				return;
+			}
 
-				const fullName = `${user.vorname.toLowerCase()} ${user.nachname.toLowerCase()}`;
-				const reverseFullName = `${user.nachname.toLowerCase()} ${user.vorname.toLowerCase()}`;
-				return fullName.includes(query) || reverseFullName.includes(query) || user.uid.toLowerCase().includes(query) || user.studiengang.toLowerCase().includes(query);
-			}).map(user => ({
-				label: user.studiengang
-					? `${user.nachname} ${user.vorname} ${user.uid} ${user.studiengang} ${user.semester}`
-					: `${user.nachname} ${user.vorname} ${user.uid}`,
-				uid: user.uid
-			}));
+			if (query.length < 2)
+			{
+				return;
+			}
+
+			if (this.abortController)
+			{
+				this.abortController.abort();
+			}
+
+			this.abortController = new AbortController();
+			const signal = this.abortController.signal;
+
+			this.$api.call(ApiGruppe.getBenutzerSearch(query), { signal })
+				.then(result => {
+					this.filteredUsers = result.data.map(user => ({
+						label: user.studiengang
+							? `${user.nachname} ${user.vorname} ${user.uid} ${user.studiengang} ${user.semester}`
+							: `${user.nachname} ${user.vorname} ${user.uid}`,
+						uid: user.uid
+						})
+					)})
+				.catch(this.$fhcAlert.handleSystemError)
 		},
 		addUser()
 		{
@@ -144,7 +162,7 @@ export default{
 					:placeholder="$p.t('lehre', 'assignPerson')"
 					v-model="selectedUser"
 					field="label"
-					:minLength="3"
+					:minLength="2"
 					@item-select="addUser"
 					@complete="searchUser"
 				></form-input>
diff --git a/public/js/components/LVVerwaltung/Details/Form.js b/public/js/components/LVVerwaltung/Details/Form.js
index 5908512d7..d8299e4fa 100644
--- a/public/js/components/LVVerwaltung/Details/Form.js
+++ b/public/js/components/LVVerwaltung/Details/Form.js
@@ -26,16 +26,6 @@ export default {
 			default: true
 		}
 	},
-	computed: {
-		formattedAnmerkung: {
-			get() {
-				return (this.data.anmerkung || '').replace(/\\n/g, '\n');
-			},
-			set(value) {
-				this.data.anmerkung = (value || '').replace(/\n/g, '\\n');
-			}
-		}
-	},
 	template: `
 	<div>
 		<div class="row mb-3">
@@ -74,7 +64,7 @@ export default {
 				:label="$p.t('lehre', 'detailanmerkung')"
 				type="textarea"
 				container-class="col-3"
-				v-model="formattedAnmerkung"
+				v-model="data.anmerkung"
 				name="anmerkung"
 				id="anmerkung"
 				rows="10"
diff --git a/public/js/components/LVVerwaltung/Details/Gruppen.js b/public/js/components/LVVerwaltung/Details/Gruppen.js
index a6f9df005..57dc49728 100644
--- a/public/js/components/LVVerwaltung/Details/Gruppen.js
+++ b/public/js/components/LVVerwaltung/Details/Gruppen.js
@@ -90,7 +90,8 @@ export default{
 			tabulatorEvents: [],
 			showAutocomplete: false,
 			filteredGroups: [],
-			selectedGroup: null
+			selectedGroup: null,
+			abortController: null
 		}
 	},
 	watch: {
@@ -99,19 +100,42 @@ export default{
 		}
 	},
 	methods:{
-		searchGroup(event)
+
+		async searchGroup(event)
 		{
-			const query = event.query.toLowerCase().trim();
-			this.filteredGroups = this.dropdowns.gruppen_array.filter(gruppe => {
-				return gruppe.gruppe_kurzbz.toLowerCase().includes(query) || gruppe?.bezeichnung?.toLowerCase().includes(query);
-			}).map(gruppe => ({
-				label: gruppe.bezeichnung
-					? `${gruppe.gruppe_kurzbz.trim()} (${gruppe.bezeichnung})`
-					: gruppe.gruppe_kurzbz.trim(),
-				gid: gruppe.gid,
-				gruppe_kurzbz: gruppe.gruppe_kurzbz.trim(),
-				lehrverband: gruppe.lehrverband,
-			}));
+			const query = event.query.trim();
+
+			if (!query)
+			{
+				this.filteredLektor = [];
+				return;
+			}
+
+			if (query.length < 2)
+			{
+				return;
+			}
+
+			if (this.abortController)
+			{
+				this.abortController.abort();
+			}
+
+			this.abortController = new AbortController();
+			const signal = this.abortController.signal;
+
+			this.$api.call(ApiGruppe.getAllSearch(query), { signal })
+				.then(result => {
+					this.filteredGroups = result.data.map(gruppe => ({
+						label: gruppe.bezeichnung
+							? `${gruppe.gruppe_kurzbz.trim()} (${gruppe.bezeichnung})`
+							: gruppe.gruppe_kurzbz.trim(),
+						gid: gruppe.gid,
+						gruppe_kurzbz: gruppe.gruppe_kurzbz.trim(),
+						lehrverband: gruppe.lehrverband,
+						})
+					)})
+				.catch(this.$fhcAlert.handleSystemError)
 		},
 		reload() {
 			this.$refs.table.reloadTable();
diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index c03e7c84c..840d7b406 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -80,9 +80,6 @@ export default {
 				sprachen_array: [],
 				lehrform_array: [],
 				raumtyp_array: [],
-				lektor_array: [],
-				gruppen_array: [],
-				benutzer_array: [],
 			},
 			selectedStudiengang: '',
 			searchbaroptions: {
@@ -185,6 +182,13 @@ export default {
 				this.$router.replace({ name: 'byStg', params: newParams });
 			}
 		},
+		resetStgFilter()
+		{
+			const newParams = { ...this.filter, activeFilter: 'emp' };
+			delete newParams.stg;
+			this.selectedStudiengang = '';
+			this.$router.replace({ name: 'byEmp', params: newParams });
+		},
 		searchfunction(params) {
 			return this.$api.call(ApiSearchbar.search(params));
 		},
@@ -227,24 +231,6 @@ export default {
 				this.dropdowns.lehrfunktion_array = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api.call(ApiLektor.getLektoren())
-			.then(result => {
-				this.dropdowns.lektor_array = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api.call(ApiGruppe.getAll())
-			.then(result => {
-				this.dropdowns.gruppen_array = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api.call(ApiGruppe.getBenutzer())
-			.then(result => {
-				this.dropdowns.benutzer_array = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
 	},
 
 	template: `
@@ -272,12 +258,25 @@ export default {
 								:filter="filter"
 							>
 								<template #filterzuruecksetzen v-if="filter.activeFilter === 'employee'">
-									<button type="button" 
-										class="btn btn-outline-secondary btn-action"
-										title="Mitarbeiter Filter entfernen"
-										@click="resetEmployeeFilter">
+									<span class="fw-bold small">
+									[{{ $p.t('lehre', 'lektor') }}: {{ filter.emp || '' }}
+									<button type="button"
+											class="btn btn-outline-secondary btn-action btn-sm ms-1"
+											:title="$p.t('ui', 'filterdelete')"
+											@click="resetEmployeeFilter">
 										<i class="fa fa-xmark"></i>
 									</button>
+									<template v-if="filter.stg">
+										| Stg: {{ filter.stg }}
+										<button type="button"
+											class="btn btn-outline-secondary btn-action btn-sm ms-1"
+											:title="$p.t('ui', 'filterdelete')"
+											@click="resetStgFilter">
+											<i class="fa fa-xmark"></i>
+										</button>
+									</template>
+									]
+								  </span>
 								</template>
 							</lv-table>
 						</template>
diff --git a/public/js/components/LVVerwaltung/Lektor/Daten.js b/public/js/components/LVVerwaltung/Lektor/Daten.js
index a9c7e53be..21e5dc196 100644
--- a/public/js/components/LVVerwaltung/Lektor/Daten.js
+++ b/public/js/components/LVVerwaltung/Lektor/Daten.js
@@ -31,6 +31,8 @@ export default{
 			changed: {},
 			internal_mitarbeiter_uid: null,
 			filteredLektor: [],
+			abortController: null,
+			selectedLektorLabel: ''
 		}
 	},
 	computed: {
@@ -63,7 +65,10 @@ export default{
 				this.internal_mitarbeiter_uid = newVal;
 
 				if (newVal === null)
+				{
 					this.data = null;
+					this.selectedLektorLabel = '';
+				}
 				else if (newVal !== undefined && this.lehreinheit_id !== undefined)
 					this.getLektorData();
 			}
@@ -99,10 +104,15 @@ export default{
 			return this.$api.call(ApiLektor.getLektorDaten(this.lehreinheit_id, this.internal_mitarbeiter_uid))
 				.then(result => {
 					this.data = result.data;
+					this.selectedLektorLabel = `${this.data.nachname} ${this.data.vorname} (${this.data.mitarbeiter_uid})`,
 					this.original = { ...this.data };
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		onLektorSelected(selectedLektor)
+		{
+			this.data.mitarbeiter_uid = selectedLektor.value.uid;
+		},
 		updateDaten()
 		{
 			if (!this.changedLength)
@@ -139,17 +149,37 @@ export default{
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		searchLektor(event)
+		async searchLektor(event)
 		{
-			const query = event.query.toLowerCase().trim();
-			this.filteredLektor = this.dropdowns.lektor_array.filter(lektor => {
-				const fullName = `${lektor.vorname.toLowerCase()} ${lektor.nachname.toLowerCase()}`;
-				const reverseFullName = `${lektor.nachname.toLowerCase()} ${lektor.vorname.toLowerCase()}`;
-				return fullName.includes(query) || reverseFullName.includes(query) || lektor.uid.toLowerCase().includes(query);
-			}).map(lektor => ({
-				label: `${lektor.nachname} ${lektor.vorname} (${lektor.uid})`,
-				uid: lektor.uid
-			}));
+			const query = event.query.trim();
+
+			if (!query)
+			{
+				this.filteredLektor = [];
+				return;
+			}
+
+			if (query.length < 2)
+			{
+				return;
+			}
+
+			if (this.abortController)
+			{
+				this.abortController.abort();
+			}
+
+			this.abortController = new AbortController();
+			const signal = this.abortController.signal;
+
+			this.$api.call(ApiLektor.getLektorenSearch(query), { signal })
+				.then(result => {
+					this.filteredLektor = result.data.map(lektor => ({
+							label: `${lektor.nachname} ${lektor.vorname} (${lektor.uid})`,
+							uid: lektor.uid
+						})
+					)})
+				.catch(this.$fhcAlert.handleSystemError)
 		},
 
 	},
@@ -187,11 +217,12 @@ export default{
 						:disabled="data.vertrag_id !== null"
 						:suggestions="filteredLektor"
 						placeholder="Mitarbeiter hinzufügen"
-						v-model="data.mitarbeiter_uid"
+						v-model="selectedLektorLabel"
 						field="label"
 						container-class="col-3"
 						dropdown
 						@complete="searchLektor"
+						@item-select="onLektorSelected"
 						name="lektorautocomplete"
 					></form-input>
 					
@@ -231,7 +262,6 @@ export default{
 
 				</div>
 				<div class="row mb-3 d-flex align-items-end">
-					
 					<form-input
 						:label="data.default_stundensatz !== null 
 							? $p.t('lehre', 'stundensatz') + ' (' + $p.t('lehre', 'default') + ': ' + data.default_stundensatz + ')'
@@ -246,30 +276,23 @@ export default{
 						>
 					</form-input>
 					
-					<form-input
-						:label="$p.t('lehre', 'bismelden')"
-						type="checkbox"
-						container-class="col-3"
-						v-model="data.bismelden"
-						name="bismelden"
-						>
-					</form-input>
+					<div class="col-3 d-flex align-items-end">
+						<form-input
+							:label="$p.t('lehre', 'bismelden')"
+							type="checkbox"
+							v-model="data.bismelden"
+							name="bismelden"
+							>
+						</form-input>
+					</div>
 				</div>
 				
-				<div class="row mb-3">
-					<form-input
-						:label="$p.t('lehre', 'gesamtkosten')"
-						type="number"
-						name="gesamtkosten"
-						container-class="col-3"
-						readonly
-						v-model="berechneteGesamtkosten" 
-						:style="{ color: berechneteGesamtkosten <= 0 ? 'red' : 'black' }"
-						>
-					</form-input>
-					
+				<div class="d-flex mb-2 gap-2">
+					<span class="fw-bold">{{ $p.t('lehre', 'gesamtkosten') }}:</span>
+					<span :style="{ color: berechneteGesamtkosten <= 0 ? 'red' : 'black' }">
+						{{ berechneteGesamtkosten }} €
+					</span>
 				</div>
-				
 			</template>
 			
 		</fieldset>
diff --git a/public/js/components/LVVerwaltung/Lektor/Table.js b/public/js/components/LVVerwaltung/Lektor/Table.js
index 4e568f9db..461d782ed 100644
--- a/public/js/components/LVVerwaltung/Lektor/Table.js
+++ b/public/js/components/LVVerwaltung/Lektor/Table.js
@@ -3,7 +3,6 @@ import FormForm from '../../Form/Form.js';
 import FormInput from '../../Form/Input.js';
 import ApiLektor from "../../../api/lehrveranstaltung/lektor.js";
 
-
 export default{
 	name: "LVLektorTable",
 	components: {
@@ -36,7 +35,8 @@ export default{
 			],
 			showAutocomplete: false,
 			filteredLektor: [],
-			selectedLektor: ''
+			selectedLektor: '',
+			abortController: null
 		}
 	},
 	computed: {
@@ -163,17 +163,37 @@ export default{
 
 				})
 		},
-		searchLektor(event)
+		async searchLektor(event)
 		{
-			const query = event.query.toLowerCase().trim();
-			this.filteredLektor = this.dropdowns.lektor_array.filter(lektor => {
-				const fullName = `${lektor.vorname.toLowerCase()} ${lektor.nachname.toLowerCase()}`;
-				const reverseFullName = `${lektor.nachname.toLowerCase()} ${lektor.vorname.toLowerCase()}`;
-				return fullName.includes(query) || reverseFullName.includes(query) || lektor.uid.toLowerCase().includes(query);
-			}).map(lektor => ({
-				label: `${lektor.nachname} ${lektor.vorname} (${lektor.uid})`,
-				uid: lektor.uid
-			}));
+			const query = event.query.trim();
+
+			if (!query)
+			{
+				this.filteredLektor = [];
+				return;
+			}
+
+			if (query.length < 2)
+			{
+				return;
+			}
+
+			if (this.abortController)
+			{
+				this.abortController.abort();
+			}
+
+			this.abortController = new AbortController();
+			const signal = this.abortController.signal;
+
+			this.$api.call(ApiLektor.getLektorenSearch(query), { signal })
+				.then(result => {
+					this.filteredLektor = result.data.map(lektor => ({
+							label: `${lektor.nachname} ${lektor.vorname} (${lektor.uid})`,
+							uid: lektor.uid
+						})
+					)})
+				.catch(this.$fhcAlert.handleSystemError)
 		},
 		addLektor()
 		{
diff --git a/public/js/components/LVVerwaltung/Lektor/Vertrag.js b/public/js/components/LVVerwaltung/Lektor/Vertrag.js
index 095e92f7c..2c30a41c6 100644
--- a/public/js/components/LVVerwaltung/Lektor/Vertrag.js
+++ b/public/js/components/LVVerwaltung/Lektor/Vertrag.js
@@ -113,23 +113,16 @@ export default{
 		<core-form ref="form">
 			<fieldset class="overflow-hidden" v-if="showVertragsdetails">
 				<legend>  {{$p.t('lehre', 'vertragsdetails')}}  
-						  {{ data === null ? ' – Noch kein Vertrag' : '' }}
-				  </legend>
+						{{ data?.vertrag === null ? ' – ' + $p.t('lehre', 'keinvertrag') : '' }}
+				</legend>
 				<template v-if="data?.vertrag">
-					<div class="row align-items-end mb-3">
-						<form-input 
-							:label="$p.t('lehre', 'vertragsstatus')"
-							type="text"
-							readonly
-							container-class="col-3"
-							v-model="vertragsstatus"
-							:style="{fontWeight: vertragsstatus === 'Geändert' ? 'bold' : 'normal'}"
-							name="vertragsstatus"
-						/>
-						<div class="col-3 d-flex align-items-end">
-							<button 
-								type="button" 
-								class="btn btn-outline-secondary w-100"
+					<div class="d-flex justify-content-between align-items-center mb-3 flex-wrap">
+						<div class="d-flex align-items-center flex-wrap gap-2">
+							<span class="fw-bold">{{ $p.t('lehre', 'vertragsstatus') }}:</span>
+							<span :class="{ 'fw-bold': vertragsstatus === 'Geändert' }">{{ vertragsstatus }}</span>
+							<button
+								type="button"
+								class="btn btn-outline-secondary btn-sm"
 								@click="cancelVertrag"
 								:title="$p.t('lehre', 'cancelvertrag')"
 							>
@@ -137,28 +130,18 @@ export default{
 							</button>
 						</div>
 					</div>
-					{{$p.t('lehre', 'vertragurfassung')}}
-					<div class="row mb-3">
-						<form-input
-							:label="$p.t('lehre', 'semesterstunden')"
-							type="text"
-							container-class="col-3"
-							readonly
-							v-model="data.vertrag.vertragsstunden"
-							name="vertragsstunden"
-							>
-						</form-input>
+					<div class="mb-2 fw-bold text-decoration-underline">
+						{{ $p.t('lehre', 'vertragurfassung') }}
 					</div>
-					<div class="row mb-3">
-						<form-input
-							:label="$p.t('lehre', 'studiensemester')"
-							type="text"
-							container-class="col-3"
-							readonly
-							v-model="data.vertrag.vertragsstunden_studiensemester_kurzbz"
-							name="vertragsstunden_studiensemester_kurzbz"
-							>
-						</form-input>
+					<div class="ps-4">
+						<div class="d-flex mb-2 gap-2">
+							<span class="fw-bold">{{ $p.t('lehre', 'semesterstunden') }}:</span>
+							<span>{{ data.vertrag.vertragsstunden }}</span>
+						</div>
+						<div class="d-flex mb-2 gap-2">
+							<span class="fw-bold">{{ $p.t('lehre', 'studiensemester') }}:</span>
+							<span>{{ data.vertrag.vertragsstunden_studiensemester_kurzbz }}</span>
+						</div>
 					</div>
 				</template>
 			</fieldset>
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 309960f54..73511a94f 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -663,6 +663,8 @@ export default {
 		@click:new="showLehreinheitModal">
 		
 		<template #actions>
+			<button @click="expandTree" class="btn btn-outline-secondary" type="button" :title="$p.t('lehre', 'aufklappen')"><i class="fa-solid fa-maximize"></i></button>
+			<button @click="resetTree" class="btn btn-outline-secondary" type="button" :title="$p.t('lehre', 'zuklappen')"><i id="togglegroup" class="fa-solid fa-minimize"></i></button>
 			<core-tag ref="tagComponent"
 				:endpoint="tagEndpoint"
 				:values="selectedColumnValues"
@@ -671,8 +673,6 @@ export default {
 				@updated="updatedTag"
 				zuordnung_typ="lehreinheit_id"
 			></core-tag>
-			<button @click="expandTree" class="btn btn-outline-secondary" type="button"><i class="fa-solid fa-maximize"></i></button>
-			<button @click="resetTree" class="btn btn-outline-secondary" type="button"><i id="togglegroup" class="fa-solid fa-minimize"></i></button>
 		</template>
 		<template #search>
 			<slot name="filterzuruecksetzen"></slot>
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index ccd555714..67d901b13 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -176,7 +176,10 @@ export default {
 		async setPreselection()
 		{
 			if (!this.preselectedKey)
+			{
+				this.selectedKey = null;
 				return;
+			}
 
 			let rawKey = this.preselectedKey
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 008ad8a8d..60fb6fb2a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -3504,6 +3504,166 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'bereitzugeteilt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lektor bereits zugewiesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Lektor already assigned',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'grpbereitszugeteilt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppe bereits zugewiesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Group already assigned',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'grpbereitsverplant',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppe ist bereits verplant',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Group is already scheduled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lektorbereitsverplant',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wechsel vom Mitarbeiter nicht möglich da er bereits verplant ist.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Changing the employee is not possible because they are already scheduled.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'keinvertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Noch kein Vertrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No contract yet',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'readonlycategory',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Kategorie ist deaktiviert und kann nur im Lesemodus angezeigt werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The category is deactivated and can only be viewed in read-only mode.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'werksvertragsects',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Werkvertragsvolumen in ECTS',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Work contract volume in ECTS',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'lv_entwicklung_rolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rolle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Role',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
@@ -45606,6 +45766,46 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'aufklappen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Expand',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zuklappen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zuklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Collapse',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From e3b6852017fa83103b7ce4c78e8454e04f5cb2c1 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 25 Sep 2025 14:42:34 +0200
Subject: [PATCH 057/101] bug beim aendern des status auf student mit
 ausbildungssemester 0 behoben

---
 .../controllers/api/frontend/v1/stv/Status.php     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 665fb620f..740ec4c8e 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -296,7 +296,7 @@ class Status extends FHCAPI_Controller
 			}],
 			//Check if Rolle already exists
 			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
-				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
@@ -902,7 +902,7 @@ class Status extends FHCAPI_Controller
 
 		$this->form_validation->set_rules('_default', '', [
 			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
-				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
@@ -919,7 +919,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
@@ -944,7 +944,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
@@ -969,7 +969,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
@@ -994,7 +994,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
@@ -1019,7 +1019,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(

From ca55c8b1a78afd35d03954a0132b3e93b4ae52a1 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 29 Sep 2025 13:48:14 +0200
Subject: [PATCH 058/101] Archiv.js: import add missing file extension,
 DocumentDropdown: remove wrapper div causing button not being aligned

---
 .../components/Stv/Studentenverwaltung/Details/Archiv.js  | 2 +-
 .../Details/Archiv/DocumentDropdown.js                    | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index a3ac6593b..9f28a51a1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -4,7 +4,7 @@ import AkteEdit from "./Archiv/Edit.js";
 
 import ApiStvArchiv from '../../../../api/factory/stv/archiv.js';
 import ApiStvDocuments from '../../../../api/factory/stv/documents.js';
-import DocumentDropdown from "../Details/Archiv/DocumentDropdown";
+import DocumentDropdown from "../Details/Archiv/DocumentDropdown.js";
 
 
 export default {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
index 001a45ed8..1136d6f98 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
@@ -38,12 +38,11 @@ export default {
 		}
 	},
 	template: `
-	<div class="stv-document-dropdown">
-		<div class="btn-group">
+		<div class="stv-document-dropdown btn-group">
 			<button
 				ref="toolbarButton"
 				type="button"
-				class="btn btn-secondary dropdown-toggle px-5 ms-4"
+				class="btn btn-secondary dropdown-toggle px-5 ms-5"
 				data-bs-toggle="dropdown"
 				data-bs-auto-close="outside"
 				aria-expanded="false"
@@ -94,8 +93,7 @@ export default {
 				</template>
 		  </ul>
 
-	</div>
-</div>`
+	</div>`
 };
 
 

From 3c47453762846abaf8c5ce7b4d291bf0f9dcbce9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 29 Sep 2025 15:49:13 +0200
Subject: [PATCH 059/101] add projektarbeit tab to tab_order

---
 application/config/stv.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/config/stv.php b/application/config/stv.php
index 7e74c109f..e03c00084 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -102,6 +102,7 @@ $config['student_tab_order'] = [
 	'grades',
 	'exam',
 	'exemptions',
+	'projektarbeit',
 	'finalexam',
 	'mobility',
 	'jointstudies',

From f518d56d4ee1219ece0d97bf1082eb7724c43b7e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 30 Sep 2025 11:01:08 +0200
Subject: [PATCH 060/101] StV: configurable Filters

---
 .../api/frontend/v1/stv/Config.php            | 153 +++++++++++
 .../api/frontend/v1/stv/Students.php          |  41 +--
 application/models/crm/Prestudent_model.php   | 116 ++++++++
 public/js/api/factory/stv/app.js              |   6 +
 .../Stv/Studentenverwaltung/List.js           |  52 +---
 .../Stv/Studentenverwaltung/List/Filter.js    | 102 +++++++
 .../Studentenverwaltung/List/Filter/Item.js   | 113 ++++++++
 system/phrasesupdate.php                      | 260 +++++++++++++++---
 8 files changed, 735 insertions(+), 108 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/List/Filter.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/List/Filter/Item.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d52016943..b08af66bb 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -33,6 +33,7 @@ class Config extends FHCAPI_Controller
 	{
 		// TODO(chris): permissions
 		parent::__construct([
+			'filter' => ['admin:r', 'assistenz:r'],
 			'student' => ['admin:r', 'assistenz:r'],
 			'students' => ['admin:r', 'assistenz:r']
 		]);
@@ -52,6 +53,158 @@ class Config extends FHCAPI_Controller
 		$this->load->config('stv');
 	}
 
+	/**
+	 * Get the config for the student filters
+	 *
+	 * @return void
+	 */
+	public function filter()
+	{
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
+
+		$this->BuchungstypModel->addOrder('beschreibung');
+		
+		$result = $this->BuchungstypModel->load();
+
+		$buchungstyp_kurzbz = $this->getDataOrTerminateWithError($result);
+		$buchungstyp_kurzbz_plus_all = array_merge([[
+			'buchungstyp_kurzbz' => 'all',
+			'beschreibung' => $this->p->t('stv', 'konto_all_types')
+		]], $buchungstyp_kurzbz);
+
+		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+
+		$result = $this->StatusgrundModel->getAktiveGruende();
+		
+		$statusgruende = $this->getDataOrTerminateWithError($result);
+
+		$result = [];
+
+		$result[] = [
+			'id' => 'filter_konto_count_0',
+			'label' => $this->p->t('stv', 'filter_konto_count_0'),
+			'type' => 'konto',
+			'fixed' => [
+				'missing' => true,
+				'usestdsem' => true
+			],
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_konto_missing_counter',
+			'label' => $this->p->t('stv', 'filter_konto_missing_counter'),
+			'type' => 'konto_counter',
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz_plus_all,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				],
+				'samestg' => [
+					'type' => 'bool',
+					'label' => $this->p->t('stv', 'filter_konto_samestg'),
+					'default' => $this->variablelib->getVar('kontofilterstg') == 'true'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_documents',
+			'label' => $this->p->t('stv', 'filter_documents'),
+			'type' => 'documents'
+		];
+		$result[] = [
+			'id' => 'filter_konto_missing_counter_past',
+			'label' => $this->p->t('stv', 'filter_konto_missing_counter_past'),
+			'type' => 'konto_counter',
+			'fixed' => [
+				'past' => true
+			],
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz_plus_all,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				],
+				'samestg' => [
+					'type' => 'bool',
+					'label' => $this->p->t('stv', 'filter_konto_samestg'),
+					'default' => $this->variablelib->getVar('kontofilterstg') == 'true'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_konto_missing_studiengebuehr',
+			'label' => $this->p->t('stv', 'filter_konto_missing_studiengebuehr'),
+			'type' => 'konto',
+			'fixed' => [
+				'missing' => true,
+				'usestdsem' => true
+			],
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_konto_studiengebuehrerhoeht',
+			'label' => $this->p->t('stv', 'filter_konto_studiengebuehrerhoeht'),
+			'type' => 'konto',
+			'fixed' => [
+				'usestdsem' => true
+			],
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_zgv_without_date',
+			'label' => $this->p->t('stv', 'filter_zgv_without_date'),
+			'type' => 'zgv'
+		];
+		$result[] = [
+			'id' => 'filter_statusgrund',
+			'label' => $this->p->t('stv', 'filter_statusgrund'),
+			'type' => 'statusgrund',
+			'fixed' => [
+				'usestdsem' => true
+			],
+			'dynamic' => [
+				'statusgrund_id' => [
+					'type' => 'select',
+					'values' => $statusgruende,
+					'value_key' => 'statusgrund_id',
+					'label_key' => 'bezeichnung'
+				]
+			]
+		];
+
+		Events::trigger('stv_conf_filter', function & () use (&$result) {
+			return $result;
+		});
+
+		$this->terminateWithSuccess($result);
+	}
+
 	public function student()
 	{
 		$result = [];
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 9de0c29b1..49fecbfcd 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -44,7 +44,6 @@ class Students extends FHCAPI_Controller
 		}
 
 		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('PhrasesLib');
 		$this->loadPhrases(
 			array(
@@ -854,40 +853,20 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function addFilter($studiensemester_kurzbz)
 	{
-		$filter = json_decode($this->input->get('filter'), true);
+		$filter = $this->input->post('filter');
+		
 		if (!is_array($filter))
 		{
-			$this->addMeta('addfilter', 'invalid filter: ' . $this->input->get('filter'));
+			$this->addMeta('addfilter', 'invalid filter: ' . json_encode($this->input->post('filter')));
 			return;
 		}
-		if (isset($filter['konto_count_0'])) {
-			$bt = $this->PrestudentModel->escape($filter['konto_count_0']);
-			$stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
-
-			$this->PrestudentModel->db->where('(
-				SELECT count(*) 
-				FROM public.tbl_konto 
-				WHERE person_id=tbl_prestudent.person_id 
-				AND buchungstyp_kurzbz=' . $bt . ' 
-				AND studiensemester_kurzbz=' . $stdsem . '
-			) =', 0);
-			$this->PrestudentModel->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
-		}
-		if (isset($filter['konto_missing_counter'])) {
-			$bt = $this->PrestudentModel->escape($filter['konto_missing_counter']);
-			$stg = '';
-			if ($this->variablelib->getVar('kontofilterstg') == 'true')
-				$stg = ' AND studiengang_kz=tbl_prestudent.studiengang_kz';
-
-			$bt = $bt == 'alle' ? '' : ' AND buchungstyp_kurzbz=' . $bt;
-
-			$this->PrestudentModel->db->where('(
-				SELECT sum(betrag) 
-				FROM public.tbl_konto 
-				WHERE person_id=tbl_prestudent.person_id' .
-				$bt .
-				$stg . '
-			) !=', 0);
+		foreach ($filter as $item) {
+			if (isset($item['usestdsem']) && $item['usestdsem'])
+				$item['studiensemester_kurzbz'] = $studiensemester_kurzbz;
+			if (!$this->PrestudentModel->addFilter($item)) {
+				$this->addMeta('addfilter', 'invalid filter: ' . json_encode($item));
+				return;
+			}
 		}
 	}
 }
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index ff56c3268..ad5c3e141 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -1,5 +1,7 @@
 <?php
 
+use CI3_Events as Events;
+
 class Prestudent_model extends DB_Model
 {
 	/**
@@ -782,4 +784,118 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
+
+	/**
+	 * Adds a filter to the query builder
+	 *
+	 * @param array			$filter
+	 * @return boolean
+	 */
+	public function addFilter($filter)
+	{
+		if (!isset($filter['type']))
+			return false;
+
+		switch ($filter['type']) {
+			case 'konto':
+				$bt = '';
+				$stdsem = '';
+				$comp = '!=';
+
+				if (isset($filter['buchungstyp_kurzbz']) && $filter['buchungstyp_kurzbz'] != 'all')
+					$bt = ' AND buchungstyp_kurzbz=' . $this->escape($filter['buchungstyp_kurzbz']);
+				
+				if (isset($filter['studiensemester_kurzbz']))
+					$stdsem = ' AND studiensemester_kurzbz=' . $this->escape($filter['studiensemester_kurzbz']);
+
+				if (isset($filter['missing']) && $filter['missing']) {
+					$comp = '=';
+					$this->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
+				}
+
+				$this->db->where('(
+					SELECT count(*) 
+					FROM public.tbl_konto 
+					WHERE person_id=tbl_prestudent.person_id 
+					' . $bt . ' 
+					' . $stdsem . '
+				) ' . $comp, 0);
+				break;
+			
+			case 'konto_counter':
+				$bt = '';
+				$samestg = '';
+				$past = '';
+
+				if (isset($filter['buchungstyp_kurzbz']) && $filter['buchungstyp_kurzbz'] != 'all')
+					$bt = ' AND buchungstyp_kurzbz = ' . $this->escape($filter['buchungstyp_kurzbz']);
+				
+				if (isset($filter['samestg']) && $filter['samestg'])
+					$samestg = ' AND studiengang_kz = tbl_prestudent.studiengang_kz';
+
+				if (isset($filter['past']) && $filter['past'])
+					$past = ' AND buchungsdatum < NOW()';
+
+				$this->db->where('(
+					SELECT sum(betrag) 
+					FROM public.tbl_konto 
+					WHERE person_id = tbl_prestudent.person_id 
+					' . $bt . ' 
+					' . $samestg . '
+					' . $past . '
+				) !=', 0);
+				break;
+			
+			case 'zgv':
+				$this->db
+					->group_start()
+						->group_start()
+							->where('zgv_code IS NOT NULL')
+							->where('zgvdatum IS NULL')
+						->group_end()
+						->or_group_start()
+							->where('zgvmas_code IS NOT NULL')
+							->where('zgvmadatum IS NULL')
+						->group_end()
+						->or_group_start()
+							->where('zgvdoktor_code IS NOT NULL')
+							->where('zgvdoktordatum IS NULL')
+						->group_end()
+					->group_end();
+				break;
+			
+			case 'documents':
+				$this->db->where('(
+					SELECT count(*) 
+					FROM public.tbl_dokumentstudiengang 
+					WHERE dokument_kurzbz NOT IN (
+						SELECT dokument_kurzbz 
+						FROM tbl_dokumentprestudent 
+						WHERE prestudent_id=tbl_prestudent.prestudent_id
+					)
+					AND studiengang_kz=tbl_prestudent.studiengang_kz
+				) !=', 0);
+				break;
+
+			case 'statusgrund':
+				if (!isset($filter['statusgrund_id']))
+					return false;
+
+				if (isset($filter['studiensemester_kurzbz']))
+					$stdsem = ' AND studiensemester_kurzbz=' . $this->escape($filter['studiensemester_kurzbz']);
+
+				$this->db->where('(
+					SELECT count(*) 
+					FROM public.tbl_prestudentstatus 
+					WHERE prestudent_id = tbl_prestudent.prestudent_id 
+					AND statusgrund_id = ' . $this->escape($filter['statusgrund_id']) . '
+					' . $stdsem . '
+				) !=', 0);
+				break;
+		}
+
+		Events::trigger('prestudent_add_filter', $filter);
+
+		return true;
+	}
 }
diff --git a/public/js/api/factory/stv/app.js b/public/js/api/factory/stv/app.js
index 6fcf46700..d75207c26 100644
--- a/public/js/api/factory/stv/app.js
+++ b/public/js/api/factory/stv/app.js
@@ -16,6 +16,12 @@
  */
 
 export default {
+	configFilter() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/config/filter'
+		};
+	},
 	configStudent() {
 		return {
 			method: 'get',
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 67cada523..56f3cb0d5 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -1,12 +1,14 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import ListNew from './List/New.js';
+import ListFilter from './List/Filter.js';
 
 
 export default {
 	name: "ListPrestudents",
 	components: {
 		CoreFilterCmpt,
-		ListNew
+		ListNew,
+		ListFilter
 	},
 	inject: {
 		'lists': {
@@ -119,7 +121,7 @@ export default {
 					{
 						return Promise.resolve({ data: []});
 					}
-					return this.$api.call({url, params});
+					return this.$api.call({method: 'post', url, params});
 				},
 				ajaxResponse: (url, params, response) => {
 					return response?.data;
@@ -157,8 +159,7 @@ export default {
 			],
 			focusObj: null, // TODO(chris): this should be in the filter component
 			lastSelected: null,
-			filterKontoCount0: undefined,
-			filterKontoMissingCounter: undefined,
+			filter: [],
 			count: 0,
 			filteredcount: 0,
 			selectedcount: 0,
@@ -194,6 +195,10 @@ export default {
 				}
 			}
 		},
+		updateFilter(filter) {
+			this.filter = filter;
+			this.updateUrl();
+		},
 		updateUrl(endpoint, first) {
 			this.lastSelected = first ? undefined : this.selected;
 
@@ -214,14 +219,9 @@ export default {
 				encodeURIComponent(this.currentSemester)
 				);
 
-			const params = {}, filter = {};
-			if (this.filterKontoCount0)
-				filter.konto_count_0 = this.filterKontoCount0;
-			if (this.filterKontoMissingCounter)
-				filter.konto_missing_counter = this.filterKontoMissingCounter;
-
-			if (filter.konto_count_0 || filter.konto_missing_counter)
-				params.filter = filter;
+			const params = {};
+			if (this.filter.length)
+				params.filter = this.filter;
 
 			if (!this.$refs.table.tableBuilt) {
 				if (!this.$refs.table.tabulator) {
@@ -311,9 +311,9 @@ export default {
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
 	// TODO(chris): filter component column chooser has no accessibilty features
-	template: `
+	template: /* html */`
 	<div class="stv-list h-100 pt-3">
-		<div class="tabulator-container d-flex flex-column h-100" :class="{'has-filter': filterKontoCount0 || filterKontoMissingCounter}" tabindex="0" @focusin="onFocus" @keydown="onKeydown">
+		<div class="tabulator-container d-flex flex-column h-100" :class="{'has-filter': filter.length}" tabindex="0" @focusin="onFocus" @keydown="onKeydown">
 			<core-filter-cmpt
 				ref="table"
 				:description="countsToHTML"
@@ -331,29 +331,7 @@ export default {
 			<template #filter>
 				<div class="card">
 					<div class="card-body">
-						<div class="input-group mb-3">
-							<label class="input-group-text col-4" for="stv-list-filter-konto-count-0">{{ $p.t('stv/konto_filter_count_0') }}</label>
-							<select class="form-select" id="stv-list-filter-konto-count-0" v-model="filterKontoCount0" @input="$nextTick(updateUrl)">
-								<option v-for="typ in lists.buchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz">
-									{{ typ.beschreibung }}
-								</option>
-							</select>
-							<button v-if="filterKontoCount0" class="btn btn-outline-secondary" @click="filterKontoCount0 = undefined; updateUrl()">
-								<i class="fa fa-times"></i>
-							</button>
-						</div>
-						<div class="input-group">
-							<label class="input-group-text col-4" for="stv-list-filter-konto-missing-counter">{{ $p.t('stv/konto_filter_missing_counter') }}</label>
-							<select class="form-select" id="stv-list-filter-konto-missing-counter" v-model="filterKontoMissingCounter" @input="$nextTick(updateUrl)">
-								<option value="alle">{{ $p.t('stv/konto_all_types') }}</option>
-								<option v-for="typ in lists.buchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz">
-									{{ typ.beschreibung }}
-								</option>
-							</select>
-							<button v-if="filterKontoMissingCounter" class="btn btn-outline-secondary" @click="filterKontoMissingCounter = undefined; updateUrl()">
-								<i class="fa fa-times"></i>
-							</button>
-						</div>
+						<list-filter @change="updateFilter" />
 					</div>
 				</div>
 			</template>
diff --git a/public/js/components/Stv/Studentenverwaltung/List/Filter.js b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
new file mode 100644
index 000000000..0570d8ef2
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
@@ -0,0 +1,102 @@
+import FilterItem from './Filter/Item.js';
+
+import ApiStvApp from '../../../../api/factory/stv/app.js';
+
+export default {
+	name: "ListPrestudentsFilter",
+	components: {
+		FilterItem
+	},
+	emits: [
+		'change'
+	],
+	data() {
+		return {
+			filters: [],
+			filterConfig: [// TODO(chris): get from BE!
+				{
+					name: 'stv/konto_filter_count_0',
+					type: 'konto',
+					fixed: {
+						missing: true,
+						usestdsem: true
+					},
+					dynamic: {
+						buchungstyp_kurzbz: {
+							type: 'select',
+							values: {
+								test1: 'Test1',
+								test2: 'Test2'
+							}
+						}
+					}
+				},
+				{
+					name: 'stv/konto_filter_missing_counter',
+					type: 'konto_counter',
+					dynamic: {
+						buchungstyp_kurzbz: {
+							type: 'select',
+							values: {
+								test1: 'Test1',
+								test2: 'Test2'
+							}
+						},
+						samestg: {
+							type: 'bool',
+							label: 'stv/konto',
+							default: true
+						}
+					}
+				}
+			]
+		}
+	},
+	computed: {
+		cleanFilters() {
+			return this.filters.filter(filter => {
+				if (!filter.type)
+					return false;
+				if (Object.values(filter).some(v => v === undefined))
+					return false;
+				return true;
+			});
+		}
+	},
+	watch: {
+		cleanFilters(n) {
+			this.$emit('change', n);
+		}
+	},
+	methods: {
+		add() {
+			this.filters.push({});
+		},
+		remove(index) {
+			this.filters.splice(index, 1);
+		}
+	},
+	created() {
+		this.$api
+			.call(ApiStvApp.configFilter())
+			.then(result => {
+				this.filterConfig = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: /* html */`
+	<div class="stv-list-filter h-100">
+		<button class="btn btn-outline-dark" type="button" @click="add">
+			<span class="fa-solid fa-plus" aria-hidden="true"></span>
+			{{ $p.t('filter/filter') }}
+		</button>
+		<filter-item
+			v-for="(filter, i) in filters"
+			:key="i"
+			v-model="filters[i]"
+			:filter-config="filterConfig"
+			class="mt-3"
+			@remove="remove(i)"
+		/>
+	</div>`
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/List/Filter/Item.js b/public/js/components/Stv/Studentenverwaltung/List/Filter/Item.js
new file mode 100644
index 000000000..bfde531f8
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/List/Filter/Item.js
@@ -0,0 +1,113 @@
+export default {
+	name: "FilterItem",
+	props: {
+		modelValue: Object,
+		filterConfig: Array
+	},
+	emits: [
+		'update:modelValue',
+		'remove'
+	],
+	data() {
+		return {
+			//type: this.modelValue.type
+		};
+	},
+	computed: {
+		value: {
+			get() {
+				return this.modelValue;
+			},
+			set(value) {
+				this.$emit('update:modelValue', value);
+			}
+		},
+		filterid: {
+			get() {
+				return this.modelValue.filterid
+			},
+			set(filterid) {
+				const config = this.filterConfig.find(config => config.id == filterid);
+				const dynamic = Object.fromEntries(
+					Object.keys(config.dynamic || {}).map(key => {
+						return [
+							key,
+							config.dynamic[key].default
+						];
+					})
+				);
+				this.value = {
+					filterid,
+					type: config.type,
+					...(config.fixed || {}),
+					...dynamic
+				};
+			}
+		},
+		currentConfig() {
+			return this.filterConfig.find(config => config.id == this.filterid);
+		}
+	},
+	methods: {
+		update() {
+			this.value = this.value;
+		}
+	},
+	template: /* html */`
+	<div class="stv-list-filter-item input-group">
+		<label
+			class="input-group-text col-4"
+			for="stv-list-filter-konto-count-0"
+		>
+			{{ $p.t('stv/filter_for') }}
+		</label>
+		<select
+			v-model="filterid"
+			id="stv-list-filter-konto-count-0"
+			class="form-select"
+		>
+			<option
+				v-for="(filter, i) in filterConfig"
+				:key="i"
+				:value="filter.id"
+			>
+				{{ filter.label }}
+			</option>
+		</select>
+		<template v-for="(conf, key) in currentConfig?.dynamic" :key="key">
+			<select
+				v-if="conf.type == 'select'"
+				v-model="modelValue[key]"
+				class="form-select"
+				@input="update"
+			>
+				<option
+					v-for="(label, value) in conf.values"
+					:key="conf.value_key ? label[conf.value_key] : value"
+					:value="conf.value_key ? label[conf.value_key] : value"
+				>
+					{{ conf.label_key ? label[conf.label_key] : label }}
+				</option>
+			</select>
+			<template v-else-if="conf.type == 'bool'">
+				<div class="input-group-text">
+					<label class="form-check-label">
+						<input
+							v-model="modelValue[key]"
+							type="checkbox"
+							class="form-check-input me-1"
+							@input="update"
+						>
+						{{ conf.label }}
+					</label>
+				</div>
+			</template>
+		</template>
+		<button
+			class="btn btn-outline-secondary"
+			:title="$p.t('ui/entfernen')"
+			:aria-label="$p.t('ui/entfernen')"
+			@click="$emit('remove')"
+		><i class="fa fa-times"></i></button>
+	</div>`
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ceb265b14..b31885783 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2037,6 +2037,26 @@ $phrases = array(
 ),
 
 	//***************************	CORE/filter
+	array(
+		'app' => 'core',
+		'category' => 'filter',
+		'phrase' => 'filter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'filter',
@@ -38640,6 +38660,206 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_for',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Liste Filtern auf',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter list for',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_konto_count_0',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'nicht belastet',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'not charged',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_konto_missing_counter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'fehlende Gegenbuchungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'missing offsetting entries',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_documents',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'fehlende Dokumente',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'missing documents',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_konto_missing_counter_past',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'überfällige Buchungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'overdue payments',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_konto_missing_studiengebuehr',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'nicht gebuchte Studiengebühr',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'outstanding tuition fee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_konto_studiengebuehrerhoeht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'erhöhten Studienbeitrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'higher tuition fee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_zgv_without_date',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV eingetragen ohne Datum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV set without date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_statusgrund',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Statusgrund',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status reason',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_konto_samestg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur im aktuellen Studiengang',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Only in the selected study program',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// konto
 	array(
 		'app' => 'core',
@@ -38741,46 +38961,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'stv',
-		'phrase' => 'konto_filter_count_0',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Liste filtern auf nicht belastet:',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Filter list to not charged:',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'stv',
-		'phrase' => 'konto_filter_missing_counter',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Liste filtern auf fehlende Gegenbuchungen:',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Filter the list for missing offsetting entries:',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'stv',

From f9e2d784cf83a5f8c762324bb5bb3f8847fbfcdb Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 30 Sep 2025 11:47:34 +0200
Subject: [PATCH 061/101] phrases for fhtw addon

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b31885783..83075ba01 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38860,6 +38860,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'filter_fhtw_ausbildungsvertrag_akzeptiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausbildungsvertrag akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Training contract accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// konto
 	array(
 		'app' => 'core',

From 1414d5f1ef369c0e588ff02c8f19925a5e74ffd7 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 30 Sep 2025 14:10:21 +0200
Subject: [PATCH 062/101] Code Quality

---
 .../js/components/Stv/Studentenverwaltung/List/Filter/Item.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List/Filter/Item.js b/public/js/components/Stv/Studentenverwaltung/List/Filter/Item.js
index bfde531f8..b0c697127 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/Filter/Item.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/Filter/Item.js
@@ -50,7 +50,7 @@ export default {
 	},
 	methods: {
 		update() {
-			this.value = this.value;
+			this.$emit('update:modelValue', this.value);
 		}
 	},
 	template: /* html */`

From ba7cfc389071f893b69f6fe0c0fedf0870340ad3 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 1 Oct 2025 14:50:18 +0200
Subject: [PATCH 063/101] Make showOnlyWithUid and showOnlyWithoutUid available
 for multiselects

---
 .../js/components/Stv/Studentenverwaltung/Details.js   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 8222d637e..9c0773038 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -31,10 +31,14 @@ export default {
 			if (this.students.length == 1) {
 				const student = this.students[0];
 				if (student.uid)
-					return Object.fromEntries(Object.entries(this.configStudent).filter(([key, value]) => !value.showOnlyWithoutUid));
-				return Object.fromEntries(Object.entries(this.configStudent).filter(([key, value]) => !value.showOnlyWithUid));
+					return Object.fromEntries(Object.entries(this.configStudent).filter(([ , value ]) => !value.showOnlyWithoutUid));
+				return Object.fromEntries(Object.entries(this.configStudent).filter(([ , value ]) => !value.showOnlyWithUid));
+			} else if (this.students.every(student => student.uid)) {
+				return Object.fromEntries(Object.entries(this.configStudents).filter(([ , value ]) => !value.showOnlyWithoutUid));
+			} else if (this.students.every(student => !student.uid)) {
+					return Object.fromEntries(Object.entries(this.configStudents).filter(([ , value ]) => !value.showOnlyWithUid));
 			}
-			return this.configStudents;
+			return Object.fromEntries(Object.entries(this.configStudents).filter(([ , value ]) => !value.showOnlyWithUid && !value.showOnlyWithUid));
 		}
 	},
 	methods: {

From 2f20ddaefa6957d05bb75e98a5d09b3db8490a04 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 1 Oct 2025 14:51:29 +0200
Subject: [PATCH 064/101] Change StV config to hide Tabs when Prestudents
 without UID are selected

---
 .../api/frontend/v1/stv/Config.php            | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d52016943..a466ad94f 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -106,15 +106,18 @@ class Config extends FHCAPI_Controller
 		];
 		$result['resources'] = [
 			'title' => $this->p->t('stv', 'tab_resources'),
-			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
+			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js',
+			'showOnlyWithUid' => true
 		];
 		$result['groups'] = [
 			'title' => $this->p->t('stv', 'tab_groups'),
-			'component' => './Stv/Studentenverwaltung/Details/Gruppen.js'
+			'component' => './Stv/Studentenverwaltung/Details/Gruppen.js',
+			'showOnlyWithUid' => true
 		];
 		$result['messages'] = [
 			'title' => $this->p->t('stv', 'tab_messages'),
-			'component' => './Stv/Studentenverwaltung/Details/Messages.js'
+			'component' => './Stv/Studentenverwaltung/Details/Messages.js',
+			'showOnlyWithUid' => true
 		];
 
 		$result['grades'] = [
@@ -132,7 +135,8 @@ class Config extends FHCAPI_Controller
 
 		$result['exam'] = [
 			'title' => $this->p->t('stv', 'tab_exam'),
-			'component' => './Stv/Studentenverwaltung/Details/Pruefung.js'
+			'component' => './Stv/Studentenverwaltung/Details/Pruefung.js',
+			'showOnlyWithUid' => true
 		];
 
 		$result['exemptions'] = [
@@ -144,12 +148,14 @@ class Config extends FHCAPI_Controller
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
 			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
+			'showOnlyWithUid' => true,
 			'config' => $config['finalexam']
 		];
 
 		$result['mobility'] = [
 			'title' => $this->p->t('stv', 'tab_mobility'),
-			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
+			'component' => './Stv/Studentenverwaltung/Details/Mobility.js',
+			'showOnlyWithUid' => true
 		];
 
 		$result['archive'] = [
@@ -162,7 +168,8 @@ class Config extends FHCAPI_Controller
 
 		$result['jointstudies'] = [
 			'title' => $this->p->t('stv', 'tab_jointstudies'),
-			'component' => './Stv/Studentenverwaltung/Details/JointStudies.js'
+			'component' => './Stv/Studentenverwaltung/Details/JointStudies.js',
+			'showOnlyWithUid' => true
 		];
 
 		$result['coursedates'] = [
@@ -177,7 +184,8 @@ class Config extends FHCAPI_Controller
 
 		$result['functions'] = [
 			'title' => $this->p->t('stv', 'tab_functions'),
-			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
+			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js',
+			'showOnlyWithUid' => true
 		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
@@ -219,6 +227,7 @@ class Config extends FHCAPI_Controller
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
 			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
+			'showOnlyWithUid' => true,
 			'config' => $config['finalexam']
 		];
 		$result['archive'] = [

From 7b1bb27b341f9c124ef11afdb32530a289d7bff8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 1 Oct 2025 14:53:08 +0200
Subject: [PATCH 065/101] Multiselect group selection: show only when all
 selected have an UID

---
 application/controllers/api/frontend/v1/stv/Config.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 5898e1094..d0d807358 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -205,7 +205,8 @@ class Config extends FHCAPI_Controller
 		];
 		$result['groups'] = [
 			'title' => $this->p->t('stv', 'tab_groups'),
-			'component' => './Stv/Studentenverwaltung/Details/Groups.js'
+			'component' => './Stv/Studentenverwaltung/Details/Groups.js',
+			'showOnlyWithUid' => true
 		];
 		$result['status'] = [
 			'title' => 'Status',

From 9d2b147248631a4b0029f6d0081550907ed2253a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 1 Oct 2025 17:32:17 +0200
Subject: [PATCH 066/101] Details Header und TabsNav nicht mitscrollen

---
 public/js/components/Stv/Studentenverwaltung/Details.js | 4 ++--
 public/js/components/Tabs.js                            | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 8222d637e..f8f3ac740 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -58,11 +58,11 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="stv-details h-100 pb-3 d-flex flex-column">
+	<div class="stv-details h-100 d-flex flex-column">
 		<div v-if="!students?.length" class="justify-content-center d-flex h-100 align-items-center">
 			{{$p.t('ui', 'chooseStudent')}}
 		</div>
-		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100 pb-3">
+		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100">
 			<fhc-header
 				:headerData="students"
 				typeHeader="student"
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index aedd5c1c9..0b9b82027 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -158,10 +158,12 @@ export default {
 	template: `
 	<template v-if="useprimevue">
 
-		<tabview 
+		<tabview
+			class="d-flex flex-column"
 			:scrollable="true"
 			:lazy="true"
 			:activeIndex="calcActiveIndex"
+			:pt="{navContainer:{style: 'flex: 0 0 auto;'}, panelContainer:{class: 'overflow-y-scroll', style: 'flex: 1 1 auto;'}}"
 			@tab-click="handleTabClick"
 		>
 			<tabpanel

From 3d50eacdc38b151f53049bc80edb40593c8dd7ec Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 1 Oct 2025 18:45:26 +0200
Subject: [PATCH 067/101] limit height of profile img in detail header

---
 public/js/components/DetailHeader/DetailHeader.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 1088e3f63..04c6d1835 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -121,7 +121,8 @@ export default {
 						class="d-flex flex-column align-items-center h-100 position-relative d-inline-block"
 					>
 						<img
-						  class="d-block h-100 rounded"
+						  class="d-block rounded"
+						  style="height: 84px;"
 						  alt="Profilbild"
 						  :src="getFotoSrc(person.foto)"
 						/>
@@ -175,7 +176,8 @@ export default {
 				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 position-relative"
 						style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
 					<img
-					  class="d-block h-100 rounded"
+					  class="d-block rounded"
+					  style="height: 84px;"
 					  alt="Profilbild"
 					  :src="'data:image/jpeg;base64,' + headerDataMa.foto"
 					/>

From 81725a0fe9a5fc91f8ba19f5fb65c817fca5229d Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 2 Oct 2025 14:27:14 +0200
Subject: [PATCH 068/101] echterdv ueberprfung fixed

---
 .../Dienstverhaeltnis_model.php                | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
index b055ee954..1143398ca 100644
--- a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
+++ b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
@@ -254,22 +254,16 @@ EOSQL;
 	return $dvs;
     }
 
-	public function existsDienstverhaeltnis($mitarbeiter_uid, $start, $ende = null, $vertragsart_kurzbz = null)
+	public function existsDienstverhaeltnis($mitarbeiter_uid, $start, $ende, $vertragsart_kurzbz)
 	{
 		$this->addOrder('von', 'DESC');
 		$this->db->where('mitarbeiter_uid', $mitarbeiter_uid);
-		if (!is_null($vertragsart_kurzbz))
-			$this->db->where('vertragsart_kurzbz', $this->escape($vertragsart_kurzbz));
-
+		$this->db->where('vertragsart_kurzbz', $vertragsart_kurzbz);
 		$this->db->where('von <=', $ende);
-
-		if (!is_null($ende))
-		{
-			$this->db->group_start();
-			$this->db->where('bis >=', $start);
-			$this->db->or_where('bis IS NULL', null, false);
-			$this->db->group_end();
-		}
+		$this->db->group_start();
+		$this->db->where('bis >=', $start);
+		$this->db->or_where('bis IS NULL', null, false);
+		$this->db->group_end();
 
 		$this->addLimit(1);
 		return $this->load();

From 9309a48e97a017513cea0cb2d1a901e60d8317c1 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 6 Oct 2025 10:20:21 +0200
Subject: [PATCH 069/101] autcomplete gefixed

---
 .../controllers/api/frontend/v1/lv/Gruppe.php       | 13 +++++++++----
 .../controllers/api/frontend/v1/lv/Lektor.php       |  7 +++++--
 public/js/api/lehrveranstaltung/gruppe.js           |  4 ++--
 public/js/api/lehrveranstaltung/lektor.js           |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/application/controllers/api/frontend/v1/lv/Gruppe.php b/application/controllers/api/frontend/v1/lv/Gruppe.php
index a573c3ea3..daebe8a61 100644
--- a/application/controllers/api/frontend/v1/lv/Gruppe.php
+++ b/application/controllers/api/frontend/v1/lv/Gruppe.php
@@ -109,11 +109,14 @@ class Gruppe extends FHCAPI_Controller
 	}
 
 
-	public function getAllSearch($query = null)
+	public function getAllSearch()
 	{
+		$query = $this->input->get('query');
+
 		if (is_null($query))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-		$query_words = explode(' ', urldecode($query));
+
+		$query_words = explode(' ', $query);
 
 		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
 											studiengang_kz,
@@ -177,12 +180,14 @@ class Gruppe extends FHCAPI_Controller
 		$this->terminateWithSuccess($all_gruppen);
 	}
 
-	public function getBenutzerSearch($query = null)
+	public function getBenutzerSearch()
 	{
+		$query = $this->input->get('query');
+
 		if (is_null($query))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
-		$query_words = explode(' ', urldecode($query));
+		$query_words = explode(' ', $query);
 
 		$this->_ci->PersonModel->addSelect('vorname, nachname, uid, semester, UPPER(CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz)) as studiengang');
 		$this->_ci->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
diff --git a/application/controllers/api/frontend/v1/lv/Lektor.php b/application/controllers/api/frontend/v1/lv/Lektor.php
index ccdc79133..cce7f6e8b 100644
--- a/application/controllers/api/frontend/v1/lv/Lektor.php
+++ b/application/controllers/api/frontend/v1/lv/Lektor.php
@@ -208,11 +208,14 @@ class Lektor extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($this->_ci->LehrfunktionModel->load()));
 	}
 
-	public function getLektorenSearch($query = null)
+	public function getLektorenSearch()
 	{
+		$query = $this->input->get('query');
+
 		if (is_null($query))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-		$query_words = explode(' ', urldecode($query));
+
+		$query_words = explode(' ', $query);
 
 		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
 		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
diff --git a/public/js/api/lehrveranstaltung/gruppe.js b/public/js/api/lehrveranstaltung/gruppe.js
index 386938160..44340bec7 100644
--- a/public/js/api/lehrveranstaltung/gruppe.js
+++ b/public/js/api/lehrveranstaltung/gruppe.js
@@ -41,7 +41,7 @@ export default {
 	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/lv/gruppe/getBenutzerSearch/' + encodeURIComponent(query)
+			url: `/api/frontend/v1/lv/gruppe/getBenutzerSearch?query=${encodeURIComponent(query)}`
 		};
 	},
 
@@ -49,7 +49,7 @@ export default {
 	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/lv/gruppe/getAllSearch/'  + encodeURIComponent(query)
+			url: `/api/frontend/v1/lv/gruppe/getAllSearch?query=${encodeURIComponent(query)}`
 		};
 	},
 
diff --git a/public/js/api/lehrveranstaltung/lektor.js b/public/js/api/lehrveranstaltung/lektor.js
index 9539315aa..76a8c59a4 100644
--- a/public/js/api/lehrveranstaltung/lektor.js
+++ b/public/js/api/lehrveranstaltung/lektor.js
@@ -12,7 +12,7 @@ export default {
 	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/lv/lektor/getLektorenSearch/' + encodeURIComponent(query)
+			url: `/api/frontend/v1/lv/lektor/getLektorenSearch?query=${encodeURIComponent(query)}`
 		};
 	},
 

From e11d72ace0e22954406d022111732db92127bbc0 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 8 Oct 2025 13:48:45 +0200
Subject: [PATCH 070/101] bei den tags copy button hinzugefuegt datatree
 reexpand gefixed nach dem loeschen und hinzufuegen

---
 public/css/tags.css                           |  8 ++++-
 .../js/components/LVVerwaltung/Setup/Table.js | 35 ++++++++++++-------
 public/js/components/Tag/Tag.js               | 12 +++++++
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/public/css/tags.css b/public/css/tags.css
index 8cf306626..9e0d7ee4b 100644
--- a/public/css/tags.css
+++ b/public/css/tags.css
@@ -95,6 +95,12 @@
 
 .modificationdate {
 	font-style: italic;
-	font-size: 0.7em;
+	font-size: 1em;
 	text-align: left;
 }
+
+
+.copy-btn {
+	float: right;
+	margin-top: 3px;
+}
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 73511a94f..c3fe9a8a7 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -563,28 +563,36 @@ export default {
 			this.allRows.forEach(row => {
 				if (row.getTreeChildren().length > 0 && row.isTreeExpanded())
 				{
-					this.expanded.push(row.getData().uniqueindex);
+					this.expanded.push(row.getData().lv_bezeichnung);
 				}
 			});
 		},
 		reexpandRows() {
 			this.allRows = this.getAllRows(this.$refs.table.tabulator.getRows());
 
-			const matchingRows = this.allRows.filter(row =>
-				this.expanded.includes(row.getData().uniqueindex)
-			);
+			let lastMatchingRow = null;
 
-			if (matchingRows.length === 0)
-				this.currentTreeLevel = 0;
-
-			matchingRows.forEach((row, index) => {
-				row._row.modules.dataTree.open = true;
-
-				if (index === matchingRows.length - 1)
+			this.allRows.forEach(row => {
+				if (this.expanded.includes(row.getData().lv_bezeichnung))
 				{
-					row.treeExpand();
+					if (row._row.modules.dataTree)
+					{
+						row._row.modules.dataTree.open = true;
+					}
+
+					if (row._row.data._children?.length > 0)
+					{
+						lastMatchingRow = row;
+					}
 				}
 			});
+
+			if (lastMatchingRow)
+			{
+				lastMatchingRow.treeExpand();
+			}
+
+			this.$refs.table.tabulator.redraw();
 		},
 		deleteLehreinheit(row)
 		{
@@ -624,7 +632,7 @@ export default {
 		},
 		expandTree()
 		{
-			this.currentTreeLevel = (this.currentTreeLevel || 0) + 1;
+			this.currentTreeLevel = (this.currentTreeLevel || 1);
 
 			let lastMatchingRow = null;
 
@@ -645,6 +653,7 @@ export default {
 			if (lastMatchingRow)
 			{
 				lastMatchingRow.treeExpand();
+				this.currentTreeLevel++;
 			}
 			this.$refs.table.tabulator.redraw();
 		},
diff --git a/public/js/components/Tag/Tag.js b/public/js/components/Tag/Tag.js
index a7c7a61ab..6848f7951 100644
--- a/public/js/components/Tag/Tag.js
+++ b/public/js/components/Tag/Tag.js
@@ -200,6 +200,9 @@ export default {
 				minute: "2-digit",
 				second: "2-digit"
 			});
+		},
+		async copy (){
+			await navigator.clipboard.writeText(this.tagData.notiz);
 		}
 	},
 	template: `
@@ -236,6 +239,15 @@ export default {
 						:readonly="tagData.readonly"
 						placeholder="Notiz..."
 					></form-input>
+					<button
+						type="button" 
+						class="btn btn-outline-secondary btn-sm copy-btn" 
+						@click="copy" 
+						v-if="mode === 'edit'" 
+						:disabled="!tagData.notiz || tagData.notiz.trim() === ''"
+					>
+						<i class="fa-solid fa-copy"></i>
+					</button>
 					<div class="modificationdate">
 						<span v-if="tagData.verfasser">
 							{{ $p.t('notiz', 'tag_verfasser', { 0: tagData.verfasser, 1: tagData.insertamum }) }}

From 1fbca8bdab52adf77632ab029679d51c04da7eb9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Oct 2025 10:14:47 +0200
Subject: [PATCH 071/101] Bugfix: Add overflow for horizontal scrolling

---
 public/js/components/Calendar/Base/Grid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index c232dd955..3418a9151 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -316,7 +316,7 @@ export default {
 	template: /* html */`
 	<div
 		class="fhc-calendar-base-grid"
-		style="display:grid;width:100%;height:100%"
+		style="display:grid;width:100%;height:100%;overflow:auto"
 		:style="'grid-template-' + axisRow + 's:auto' + (allDayEvents ? ' auto ' : ' ') + '1fr;grid-template-' + axisCol + 's:auto ' + styleGridCols"
 	>
 		<div

From 9fa7166c84ead91f06a520b7c8de05d688800234 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 17 Oct 2025 12:33:22 +0200
Subject: [PATCH 072/101] added download to StudentList

---
 .../components/Stv/Studentenverwaltung/List.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 67cada523..a5331a7c4 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -307,6 +307,23 @@ export default {
 				+ ' | '
 				+ this.$p.t('global/gesamt')
 				+ ': <strong>' + (this.count || 0) + '</strong>';
+		},
+		downloadConfig() {
+			return {
+				csv: {
+					formatter: 'csv',
+					file: this.fileString,
+					options: {
+						delimiter: ';',
+						bom: true,
+					}
+				}
+			};
+		},
+		fileString() {
+			let today = new Date().toLocaleDateString('en-GB')
+				.replace(/\//g, '_');
+			return "StudentList_" + today + ".csv";
 		}
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
@@ -322,6 +339,7 @@ export default {
 				table-only
 				:side-menu="false"
 				reload
+				:download="downloadConfig"
 				` + /* TODO(chris): Ausgeblendet für Testing
 				new-btn-show
 				*/`

From 1623c8e51c43199a38d413c9d3f76eadc0e21755 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 22 Oct 2025 16:57:19 +0200
Subject: [PATCH 073/101] Ausbildungsvertrag: akadgrad is coming from
 Studienordnung

---
 rdf/ausbildungsvertrag.xml.php | 42 ++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/rdf/ausbildungsvertrag.xml.php b/rdf/ausbildungsvertrag.xml.php
index 56dfd95a4..3be40e0e2 100644
--- a/rdf/ausbildungsvertrag.xml.php
+++ b/rdf/ausbildungsvertrag.xml.php
@@ -332,6 +332,13 @@ foreach($prestudent_arr as $prest_id)
 					{
 						$studiengangbezeichnung = $studienordnung->__get('studiengangbezeichnung');
 						$studiengangbezeichnung_englisch = $studienordnung->__get('studiengangbezeichnung_englisch');
+						$akadgrad = new akadgrad();
+						if ($akadgrad->load($studienordnung->__get('akadgrad_id')))
+						{
+							// TODO - geschlechterneutral? m/w/d
+							$akadgrad_titel = $akadgrad->titel;
+							$akadgrad_kurzbz = $akadgrad->akadgrad_kurzbz;
+						}
 					}
 				}
 				$studiengang_bezeichnung = empty($studiengangbezeichnung) ? $studiengang->bezeichnung : $studiengangbezeichnung;
@@ -428,25 +435,30 @@ foreach($prestudent_arr as $prest_id)
 
 					//Wenn Quereinsteiger stimmt studiengang_maxsemester nicht mit der tatsaechlichen Ausbildungsdauer ueberein
 					$student_maxsemester = ($studiengang->max_semester-$ausbildungssemester)+1;
+
+					// TODO: where to get semester duration for master Legrgaenge?
+					//if ($lehrgangstyp->lgartcode == 1) $student_maxsemester += 2;
 					echo "\t\t<student_maxsemester>".$student_maxsemester."</student_maxsemester>\n";
 					echo "\t\t<student_anzahljahre>".($student_maxsemester/2)."</student_anzahljahre>\n";
-
-					//Bis die Akadgrad-Tabelle an die Studienordnung angepasst ist, wird der Akadgrad hier ermittelt
-
-					$akadgrad_titel = '';
-					$akadgrad_kurzbz = '';
-
-					$qry = "SELECT * FROM lehre.tbl_akadgrad
-							WHERE studiengang_kz=".$db->db_add_param($studiengang->studiengang_kz, FHC_INTEGER)."
-							AND (geschlecht=".$db->db_add_param($person->geschlecht, FHC_STRING)." OR geschlecht IS NULL)
-							LIMIT 1";
-
-					if($db->db_query($qry))
+					if (!isset($akadgrad_titel) || $akadgrad_titel == '')
 					{
-						if($row = $db->db_fetch_object())
+						//Bis die Akadgrad-Tabelle an die Studienordnung angepasst ist, wird der Akadgrad hier ermittelt
+
+						$akadgrad_titel = '';
+						$akadgrad_kurzbz = '';
+
+						$qry = "SELECT * FROM lehre.tbl_akadgrad
+								WHERE studiengang_kz=".$db->db_add_param($studiengang->studiengang_kz, FHC_INTEGER)."
+								AND (geschlecht=".$db->db_add_param($person->geschlecht, FHC_STRING)." OR geschlecht IS NULL)
+								LIMIT 1";
+
+						if($db->db_query($qry))
 						{
-							$akadgrad_titel = $row->titel;
-							$akadgrad_kurzbz = $row->akadgrad_kurzbz;
+							if($row = $db->db_fetch_object())
+							{
+								$akadgrad_titel = $row->titel;
+								$akadgrad_kurzbz = $row->akadgrad_kurzbz;
+							}
 						}
 					}
 

From 8ddc2f02fece2440279012082196bb513ccfaaa7 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Oct 2025 11:47:33 +0200
Subject: [PATCH 074/101] SVG Icons

---
 public/css/SvgIcons.css | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 public/css/SvgIcons.css

diff --git a/public/css/SvgIcons.css b/public/css/SvgIcons.css
new file mode 100644
index 000000000..f25d842a4
--- /dev/null
+++ b/public/css/SvgIcons.css
@@ -0,0 +1,28 @@
+/* Themable Variables */
+:root {
+	--svg-icon-apps: var(--fhc-icon-apps, url('data:image/svg+xml,\
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">\
+			<circle cx="15" cy="15" r="15"/>\
+			<circle cx="15" cy="50" r="15"/>\
+			<circle cx="15" cy="85" r="15"/>\
+			<circle cx="50" cy="15" r="15"/>\
+			<circle cx="50" cy="50" r="15"/>\
+			<circle cx="50" cy="85" r="15"/>\
+			<circle cx="85" cy="15" r="15"/>\
+			<circle cx="85" cy="50" r="15"/>\
+			<circle cx="85" cy="85" r="15"/>\
+		</svg>'));
+}
+.svg-icon {
+	display: inline-block;
+	width: 1rem;
+	line-height: 1;
+	background-color: currentColor;
+}
+.svg-icon:before {
+	content: "\00a0";
+}
+.svg-icon.svg-icon-apps {
+	-webkit-mask-image: var(--svg-icon-apps);
+	mask-image: var(--svg-icon-apps);
+}

From 752ef8a57bbac02d0056aecac24e36868ff24f56 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Oct 2025 11:48:03 +0200
Subject: [PATCH 075/101] AppMenu Component

---
 public/css/components/AppMenu.css | 26 ++++++++++++
 public/js/components/AppMenu.js   | 68 +++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 public/css/components/AppMenu.css
 create mode 100644 public/js/components/AppMenu.js

diff --git a/public/css/components/AppMenu.css b/public/css/components/AppMenu.css
new file mode 100644
index 000000000..b980c1efc
--- /dev/null
+++ b/public/css/components/AppMenu.css
@@ -0,0 +1,26 @@
+.fhc-app-menu {
+	display: flex;
+	flex-direction: column;
+	padding-left: 0;
+	margin: calc(var(--bs-offcanvas-padding-y) * -1) calc(var(--bs-offcanvas-padding-x) * -1);
+}
+.fhc-app-menu li {
+	display: block;
+	border: var(--bs-border-width) solid var(--bs-border-color);
+}
+.fhc-app-menu li + li {
+	border-top-width: 0;
+}
+.fhc-app-menu li a {
+	display: block;
+	padding: .5rem 1rem;
+	text-decoration: none;
+}
+.fhc-app-menu li a.active,
+.fhc-app-menu li a:hover {
+	--bs-link-color-rgb: var(--bs-link-hover-color-rgb);
+	background: var(--surface-hover);
+}
+.fhc-app-menu li a.active {
+	pointer-events: none;
+}
diff --git a/public/js/components/AppMenu.js b/public/js/components/AppMenu.js
new file mode 100644
index 000000000..33d35f8df
--- /dev/null
+++ b/public/js/components/AppMenu.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import ApiNavigation from '../api/factory/navigation.js';
+
+export default {
+	name: 'AppMenu',
+	props: {
+		appIdentifier: {
+			type: String,
+			required: true
+		},
+		navigationPage: {
+			type: String,
+			default: 'apps'
+		}
+	},
+	data() {
+		return {
+			items: []
+		};
+	},
+	watch: {
+		navigationPage() {
+			this.getItems();
+		}
+	},
+	methods: {
+		getItems() {
+			this.$api
+				.call(ApiNavigation.getMenu(this.navigationPage))
+				.then(result => {
+					this.items = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+	created() {
+		this.getItems();
+	},
+	template: /* html */`
+	<ul class="fhc-app-menu">
+		<li v-for="(menu, key) in items" :key="key">
+			<a
+				:href="menu.link"
+				@click="menu.onClickCall"
+				:class="{ active: key === appIdentifier }"
+			>
+				<i v-if="menu.icon" class="fa fa-fw" :class="'fa-'+ menu.icon" />
+				{{ menu.description }}
+			</a>
+		</li>
+	</ul>`
+};

From 11daf968501665c2078243826eb4e12e8f1c08e3 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Oct 2025 11:48:55 +0200
Subject: [PATCH 076/101] add navigation entries for StV & LvV

---
 application/config/navigation.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/application/config/navigation.php b/application/config/navigation.php
index 11fd1a3a6..2ce6a0062 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -336,3 +336,19 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'requiredPermissions' => array('admin:rw')
 	),
 );
+
+// TODO(chris): phrases?
+$config['navigation_menu']['apps'] = [
+	'stv' => [
+		'link' => site_url('studentenverwaltung'),
+		'description' => 'Studierenden Verwaltung',
+		#'icon' => 'users',
+		'requiredPermissions' => array('admin:r', 'assistenz:r')
+	],
+	'lvv' => [
+		'link' => site_url('lVVerwaltung'),
+		'description' => 'LV Verwaltung',
+		#'icon' => 'person-chalkboard',
+		'requiredPermissions' => array('admin:r', 'assistenz:r')
+	]
+];

From 5baf8b645fe5ac46c9b3a1d20036bd7592730591 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Oct 2025 11:49:07 +0200
Subject: [PATCH 077/101] use AppMenu in StV

---
 public/css/Studentenverwaltung.css            | 10 +++--
 .../js/components/Stv/Studentenverwaltung.js  | 40 +++++++++++++++++--
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index bb2588926..56e99b937 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -1,15 +1,21 @@
 @import './Fhc.css';
+@import './SvgIcons.css';
 @import './components/searchbar/searchbar.css';
 @import './components/verticalsplit.css';
 @import './components/FilterComponent.css';
 @import './components/Tabs.css';
 @import './components/Notiz.css';
 @import './components/Messages.css';
+@import './components/AppMenu.css';
 
 html {
   font-size: .875em;
 }
 
+#appMenu {
+	width: 300px;
+}
+
 .navbar-dark .navbar-brand:focus {
 	box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
 	z-index: 3;
@@ -37,10 +43,6 @@ html {
 	flex: 1 1 auto;
 }
 
-#sidebarMenu {
-	width: 0%;
-}
-
 .tabulator-row.disabled.tabulator-row-odd .tabulator-cell {
 	color: var(--gray-400);
 }
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index d0543ad59..63511924f 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -17,6 +17,7 @@
 
 import CoreSearchbar from "../searchbar/searchbar.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
+import AppMenu from "../AppMenu.js";
 import StvVerband from "./Studentenverwaltung/Verband.js";
 import StvList from "./Studentenverwaltung/List.js";
 import StvDetails from "./Studentenverwaltung/Details.js";
@@ -32,6 +33,7 @@ export default {
 	components: {
 		CoreSearchbar,
 		VerticalSplit,
+		AppMenu,
 		StvVerband,
 		StvList,
 		StvDetails,
@@ -345,11 +347,34 @@ export default {
 		//FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1);
 		this.handlePersonUrl();
 	},
-	template: `
+	template: /* html */`
 	<div class="stv">
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
-			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}</a>
-			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" :aria-label="$p.t('ui/toggle_nav')"><span class="navbar-toggler-icon"></span></button>
+			<div class="col-md-4 col-lg-3 col-xl-2 d-flex align-items-center">
+				<button
+					class="btn btn-outline-secondary border-0 m-1 collapsed"
+					type="button"
+					data-bs-toggle="offcanvas"
+					data-bs-target="#appMenu"
+					aria-controls="appMenu"
+					aria-expanded="false"
+					:aria-label="$p.t('ui/toggle_nav')"
+				>
+					<span class="svg-icon svg-icon-apps"></span>
+				</button>
+				<a class="navbar-brand me-0" :href="stvRoot">StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}</a>
+			</div>
+			<button
+				class="btn btn-outline-secondary border-0 d-md-none m-1 collapsed"
+				type="button"
+				data-bs-toggle="offcanvas"
+				data-bs-target="#sidebarMenu"
+				aria-controls="sidebarMenu"
+				aria-expanded="false"
+				:aria-label="$p.t('ui/toggle_nav')"
+			>
+				<span class="fa-solid fa-table-list"></span>
+			</button>
 			<core-searchbar
 				:searchoptions="searchbaroptions"
 				:searchfunction="searchfunction"
@@ -358,6 +383,15 @@ export default {
 		</header>
 		<div class="container-fluid overflow-hidden">
 			<div class="row h-100">
+				<aside id="appMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+					<div class="offcanvas-header">
+						StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
+					</div>
+					<div class="offcanvas-body">
+						<app-menu app-identifier="stv" />
+					</div>
+				</aside>
 				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>

From 94d5e8f7803e25cb4c5f13722b4c61ba4bafbfd5 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Oct 2025 12:48:11 +0200
Subject: [PATCH 078/101] use AppMenu in LvV

---
 .../components/LVVerwaltung/LVVerwaltung.js   | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index c03e7c84c..eed4bf3c5 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -1,5 +1,6 @@
 import CoreSearchbar from "../searchbar/searchbar.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
+import AppMenu from "../AppMenu.js";
 import StvVerband from "../Stv/Studentenverwaltung/Verband.js";
 import StvStudiensemester from "../Stv/Studentenverwaltung/Studiensemester.js";
 import LvTable from "./Setup/Table.js";
@@ -17,6 +18,7 @@ export default {
 	components: {
 		CoreSearchbar,
 		VerticalSplit,
+		AppMenu,
 		StvVerband,
 		StvStudiensemester,
 		LvTable,
@@ -247,14 +249,47 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 
-	template: `
+	template: /* html */`
 	<div class="stv">
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
-			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3">LV Verwaltung</a>
+			<div class="col-md-4 col-lg-3 col-xl-2 d-flex align-items-center">
+				<button
+					class="btn btn-outline-secondary border-0 m-1 collapsed"
+					type="button"
+					data-bs-toggle="offcanvas"
+					data-bs-target="#appMenu"
+					aria-controls="appMenu"
+					aria-expanded="false"
+					:aria-label="$p.t('ui/toggle_nav')"
+				>
+					<span class="svg-icon svg-icon-apps"></span>
+				</button>
+				<a class="navbar-brand me-0">LV Verwaltung</a>
+			</div>
+			<button
+				class="btn btn-outline-secondary border-0 d-md-none m-1 collapsed"
+				type="button"
+				data-bs-toggle="offcanvas"
+				data-bs-target="#sidebarMenu"
+				aria-controls="sidebarMenu"
+				aria-expanded="false"
+				:aria-label="$p.t('ui/toggle_nav')"
+			>
+				<span class="fa-solid fa-table-list"></span>
+			</button>
 			<core-searchbar :searchoptions="searchbaroptions" :searchfunction=searchfunction class="searchbar w-100"></core-searchbar>
 		</header>
 		<div class="container-fluid overflow-hidden">
 			<div class="row h-100">
+				<aside id="appMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+					<div class="offcanvas-header">
+						LV Verwaltung
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
+					</div>
+					<div class="offcanvas-body">
+						<app-menu app-identifier="lvv" />
+					</div>
+				</aside>
 				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>

From 406b93a628468c3b59ced8e85949a4ebeed5dc02 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 24 Oct 2025 09:22:17 +0200
Subject: [PATCH 079/101] remove comment & renaming Studierenden Verwaltung to
 Studierendenverwaltung

---
 application/config/navigation.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/config/navigation.php b/application/config/navigation.php
index 2ce6a0062..bb6cc50ba 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -337,11 +337,10 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 	),
 );
 
-// TODO(chris): phrases?
 $config['navigation_menu']['apps'] = [
 	'stv' => [
 		'link' => site_url('studentenverwaltung'),
-		'description' => 'Studierenden Verwaltung',
+		'description' => 'Studierendenverwaltung',
 		#'icon' => 'users',
 		'requiredPermissions' => array('admin:r', 'assistenz:r')
 	],

From 565640c73be7eeecc0190a43ebcbc47bf2436d13 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sun, 26 Oct 2025 17:36:22 +0100
Subject: [PATCH 080/101] Ausbildungsvertrag: akad grad from Studienordnung is
 own field

---
 rdf/ausbildungsvertrag.xml.php | 42 ++++++++++++++++------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/rdf/ausbildungsvertrag.xml.php b/rdf/ausbildungsvertrag.xml.php
index 3be40e0e2..69c34d7f3 100644
--- a/rdf/ausbildungsvertrag.xml.php
+++ b/rdf/ausbildungsvertrag.xml.php
@@ -335,9 +335,8 @@ foreach($prestudent_arr as $prest_id)
 						$akadgrad = new akadgrad();
 						if ($akadgrad->load($studienordnung->__get('akadgrad_id')))
 						{
-							// TODO - geschlechterneutral? m/w/d
-							$akadgrad_titel = $akadgrad->titel;
-							$akadgrad_kurzbz = $akadgrad->akadgrad_kurzbz;
+							$akadgrad_titel_studienordnung = $akadgrad->titel;
+							$akadgrad_kurzbz_studienordnung = $akadgrad->akadgrad_kurzbz;
 						}
 					}
 				}
@@ -436,34 +435,33 @@ foreach($prestudent_arr as $prest_id)
 					//Wenn Quereinsteiger stimmt studiengang_maxsemester nicht mit der tatsaechlichen Ausbildungsdauer ueberein
 					$student_maxsemester = ($studiengang->max_semester-$ausbildungssemester)+1;
 
-					// TODO: where to get semester duration for master Legrgaenge?
-					//if ($lehrgangstyp->lgartcode == 1) $student_maxsemester += 2;
+					// TODO: where to get semester duration for master Lehrgaenge?
 					echo "\t\t<student_maxsemester>".$student_maxsemester."</student_maxsemester>\n";
 					echo "\t\t<student_anzahljahre>".($student_maxsemester/2)."</student_anzahljahre>\n";
-					if (!isset($akadgrad_titel) || $akadgrad_titel == '')
+
+					//Bis die Akadgrad-Tabelle an die Studienordnung angepasst ist, wird der Akadgrad hier ermittelt
+
+					$akadgrad_titel = '';
+					$akadgrad_kurzbz = '';
+
+					$qry = "SELECT * FROM lehre.tbl_akadgrad
+							WHERE studiengang_kz=".$db->db_add_param($studiengang->studiengang_kz, FHC_INTEGER)."
+							AND (geschlecht=".$db->db_add_param($person->geschlecht, FHC_STRING)." OR geschlecht IS NULL)
+							LIMIT 1";
+
+					if($db->db_query($qry))
 					{
-						//Bis die Akadgrad-Tabelle an die Studienordnung angepasst ist, wird der Akadgrad hier ermittelt
-
-						$akadgrad_titel = '';
-						$akadgrad_kurzbz = '';
-
-						$qry = "SELECT * FROM lehre.tbl_akadgrad
-								WHERE studiengang_kz=".$db->db_add_param($studiengang->studiengang_kz, FHC_INTEGER)."
-								AND (geschlecht=".$db->db_add_param($person->geschlecht, FHC_STRING)." OR geschlecht IS NULL)
-								LIMIT 1";
-
-						if($db->db_query($qry))
+						if($row = $db->db_fetch_object())
 						{
-							if($row = $db->db_fetch_object())
-							{
-								$akadgrad_titel = $row->titel;
-								$akadgrad_kurzbz = $row->akadgrad_kurzbz;
-							}
+							$akadgrad_titel = $row->titel;
+							$akadgrad_kurzbz = $row->akadgrad_kurzbz;
 						}
 					}
 
 					echo "\t\t<akadgrad>".$akadgrad_titel."</akadgrad>\n";
 					echo "\t\t<akadgrad_kurzbz>".$akadgrad_kurzbz."</akadgrad_kurzbz>\n";
+					echo "\t\t<akadgrad_studienordnung>".($akadgrad_titel_studienordnung ?? '')."</akadgrad_studienordnung>\n";
+					echo "\t\t<akadgrad_kurzbz_studienordnung>".($akadgrad_kurzbz_studienordnung ?? '')."</akadgrad_kurzbz_studienordnung>\n";
 
 					echo "\t\t<datum_aktuell>".$datum_aktuell."</datum_aktuell>\n";
 

From 3c910d03bbc0aa8e2e35b21c0c4509b6faa4225d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 30 Oct 2025 15:33:12 +0100
Subject: [PATCH 081/101] Fixed Problem with Special Characters in Permission
 Description

---
 .../benutzerberechtigung_uebersicht.php       | 456 +++++++++---------
 1 file changed, 228 insertions(+), 228 deletions(-)

diff --git a/vilesci/stammdaten/benutzerberechtigung_uebersicht.php b/vilesci/stammdaten/benutzerberechtigung_uebersicht.php
index 381d3eaa8..513cbd5e1 100644
--- a/vilesci/stammdaten/benutzerberechtigung_uebersicht.php
+++ b/vilesci/stammdaten/benutzerberechtigung_uebersicht.php
@@ -62,29 +62,29 @@ $(document).ready(function()
 
 	$("#t1").tablesorter(
 	{
-		sortList: [[4,0],[0,0],[1,0],[2,0]], 
-		widgets: ["zebra", "filter", "stickyHeaders"] 
-		//headers: {4:{sorter:false}} 
+		sortList: [[4,0],[0,0],[1,0],[2,0]],
+		widgets: ["zebra", "filter", "stickyHeaders"]
+		//headers: {4:{sorter:false}}
 	});
 	$("#t2").tablesorter(
 	{
-		sortList: [[0,0],[1,0],[2,0],[3,0]], 
+		sortList: [[0,0],[1,0],[2,0],[3,0]],
 		widgets: ["zebra", "filter", "stickyHeaders"],
 		headers: {8:{sorter:false}},
-		emptyTo: "emptyMax", 
-		widgetOptions : {	filter_functions:  
-							{ 
-								// Add select menu to this column 
-								7 : { 
+		emptyTo: "emptyMax",
+		widgetOptions : {	filter_functions:
+							{
+								// Add select menu to this column
+								7 : {
 								"Ja" : function(e, n, f, i, $r, c, data) { return e === "Ja" || /^\s*$/.test(e); },
-								"Nein" : function(e, n, f, i, $r, c, data) { return e === "Nein" || /^\s*$/.test(e); } 
-								}, 
-								8 : { 
-								"Aktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonGreen" ); }, 
-								"Inaktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonRed" ) || $r.find("div").hasClass( "buttonYellow" ); } 
-								} 
-							} 
-						} 
+								"Nein" : function(e, n, f, i, $r, c, data) { return e === "Nein" || /^\s*$/.test(e); }
+								},
+								8 : {
+								"Aktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonGreen" ); },
+								"Inaktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonRed" ) || $r.find("div").hasClass( "buttonYellow" ); }
+								}
+							}
+						}
 	});
 	$("#t3").tablesorter(
 	{
@@ -92,55 +92,55 @@ $(document).ready(function()
 		widgets: ["zebra", "filter", "stickyHeaders"],
 		headers: {8:{sorter:false}},
 		emptyTo: "emptyMax",
-		widgetOptions : {	filter_functions:  
-							{ 
-								// Add select menu to this column 
-								6 : { 
+		widgetOptions : {	filter_functions:
+							{
+								// Add select menu to this column
+								6 : {
 								"Ja" : function(e, n, f, i, $r, c, data) { return e === "Ja" || /^\s*$/.test(e); },
-								"Nein" : function(e, n, f, i, $r, c, data) { return e === "Nein" || /^\s*$/.test(e); } 
-								}, 
-								7 : { 
-								"Aktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonGreen" ); }, 
-								"Inaktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonRed" ) || $r.find("div").hasClass( "buttonYellow" ); } 
-								} 
-							} 
-						} 
+								"Nein" : function(e, n, f, i, $r, c, data) { return e === "Nein" || /^\s*$/.test(e); }
+								},
+								7 : {
+								"Aktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonGreen" ); },
+								"Inaktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonRed" ) || $r.find("div").hasClass( "buttonYellow" ); }
+								}
+							}
+						}
 	});
 	$("#t4").tablesorter(
 	{
-		sortList: [[0,0],[1,0],[2,0]], 
+		sortList: [[0,0],[1,0],[2,0]],
 		widgets: ["zebra", "filter", "stickyHeaders"],
 		headers: {9:{sorter:false}},
-		emptyTo: "emptyMax", 
-		widgetOptions : {	filter_functions:  
-							{ 
-								// Add select menu to this column 
-								7 : { 
-								"Ja" : function(e, n, f, i, $r, c, data) { return /Ja/.test(e); }, 
-								"Nein" : function(e, n, f, i, $r, c, data) { return /Nein/.test(e); } 
-								}, 
-								8 : { 
-								"Aktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonGreen" ); }, 
-								"Inaktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonRed" ) || $r.find("div").hasClass( "buttonYellow" ); } 
-								} 
-							} 
-						} 
+		emptyTo: "emptyMax",
+		widgetOptions : {	filter_functions:
+							{
+								// Add select menu to this column
+								7 : {
+								"Ja" : function(e, n, f, i, $r, c, data) { return /Ja/.test(e); },
+								"Nein" : function(e, n, f, i, $r, c, data) { return /Nein/.test(e); }
+								},
+								8 : {
+								"Aktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonGreen" ); },
+								"Inaktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonRed" ) || $r.find("div").hasClass( "buttonYellow" ); }
+								}
+							}
+						}
 	});
 	$("#t5").tablesorter(
 	{
-		sortList: [[0,0],[1,0],[3,1]], 
+		sortList: [[0,0],[1,0],[3,1]],
 		widgets: ["zebra", "filter", "stickyHeaders"],
 		headers: {4:{sorter:false}},
-		emptyTo: "emptyMax", 
-		widgetOptions : {	filter_functions:  
-							{ 
-								// Add select menu to this column 
-								4 : { 
-								"Ja" : function(e, n, f, i, $r, c, data) { return /Ja/.test(e); }, 
-								"Nein" : function(e, n, f, i, $r, c, data) { return /Nein/.test(e); } 
+		emptyTo: "emptyMax",
+		widgetOptions : {	filter_functions:
+							{
+								// Add select menu to this column
+								4 : {
+								"Ja" : function(e, n, f, i, $r, c, data) { return /Ja/.test(e); },
+								"Nein" : function(e, n, f, i, $r, c, data) { return /Nein/.test(e); }
 								}
-							} 
-						} 
+							}
+						}
 	});
 	// Breite des Autocompletes korrigieren um das Springen zu verhindern
 	$.extend($.ui.autocomplete.prototype.options, {
@@ -190,58 +190,58 @@ $(document).ready(function()
 });
 
 </script>
-<style> 
-.buttonGreen 
-{ 
-	width: 10px; 
-	height: 10px; 
-	background: #d1fab9; 
-	background-image: -webkit-linear-gradient(top, #d1fab9, #00de00); 
-	background-image: -moz-linear-gradient(top, #d1fab9, #00de00); 
-	background-image: -ms-linear-gradient(top, #d1fab9, #00de00); 
-	background-image: -o-linear-gradient(top, #d1fab9, #00de00); 
-	background-image: linear-gradient(to bottom, #d1fab9, #00de00); 
-	-webkit-border-radius: 10; 
-	-moz-border-radius: 10; 
-	border-radius: 10px; 
- 
-	border: solid #999 1px; 
-	text-decoration: none; 
-} 
-.buttonYellow 
-{ 
-	width: 10px; 
-	height: 10px; 
-	background: #faf7b9; 
-	background-image: -webkit-linear-gradient(top, #faf7b9, #cfde00); 
-	background-image: -moz-linear-gradient(top, #faf7b9, #cfde00); 
-	background-image: -ms-linear-gradient(top, #faf7b9, #cfde00); 
-	background-image: -o-linear-gradient(top, #faf7b9, #cfde00); 
-	background-image: linear-gradient(to bottom, #faf7b9, #cfde00); 
-	-webkit-border-radius: 10; 
-	-moz-border-radius: 10; 
-	border-radius: 10px; 
- 
-	border: solid #999 1px; 
-	text-decoration: none; 
-} 
-.buttonRed 
-{ 
-	width: 10px; 
-	height: 10px; 
-	background: #f79c9c; 
-	background-image: -webkit-linear-gradient(top, #f79c9c, #cc0202); 
-	background-image: -moz-linear-gradient(top, #f79c9c, #cc0202); 
-	background-image: -ms-linear-gradient(top, #f79c9c, #cc0202); 
-	background-image: -o-linear-gradient(top, #f79c9c, #cc0202); 
-	background-image: linear-gradient(to bottom, #f79c9c, #cc0202); 
-	-webkit-border-radius: 10; 
-	-moz-border-radius: 10; 
-	border-radius: 10px; 
-	border: solid #999 1px; 
-	text-decoration: none; 
-} 
-</style> 
+<style>
+.buttonGreen
+{
+	width: 10px;
+	height: 10px;
+	background: #d1fab9;
+	background-image: -webkit-linear-gradient(top, #d1fab9, #00de00);
+	background-image: -moz-linear-gradient(top, #d1fab9, #00de00);
+	background-image: -ms-linear-gradient(top, #d1fab9, #00de00);
+	background-image: -o-linear-gradient(top, #d1fab9, #00de00);
+	background-image: linear-gradient(to bottom, #d1fab9, #00de00);
+	-webkit-border-radius: 10;
+	-moz-border-radius: 10;
+	border-radius: 10px;
+
+	border: solid #999 1px;
+	text-decoration: none;
+}
+.buttonYellow
+{
+	width: 10px;
+	height: 10px;
+	background: #faf7b9;
+	background-image: -webkit-linear-gradient(top, #faf7b9, #cfde00);
+	background-image: -moz-linear-gradient(top, #faf7b9, #cfde00);
+	background-image: -ms-linear-gradient(top, #faf7b9, #cfde00);
+	background-image: -o-linear-gradient(top, #faf7b9, #cfde00);
+	background-image: linear-gradient(to bottom, #faf7b9, #cfde00);
+	-webkit-border-radius: 10;
+	-moz-border-radius: 10;
+	border-radius: 10px;
+
+	border: solid #999 1px;
+	text-decoration: none;
+}
+.buttonRed
+{
+	width: 10px;
+	height: 10px;
+	background: #f79c9c;
+	background-image: -webkit-linear-gradient(top, #f79c9c, #cc0202);
+	background-image: -moz-linear-gradient(top, #f79c9c, #cc0202);
+	background-image: -ms-linear-gradient(top, #f79c9c, #cc0202);
+	background-image: -o-linear-gradient(top, #f79c9c, #cc0202);
+	background-image: linear-gradient(to bottom, #f79c9c, #cc0202);
+	-webkit-border-radius: 10;
+	-moz-border-radius: 10;
+	border-radius: 10px;
+	border: solid #999 1px;
+	text-decoration: none;
+}
+</style>
 
 </head>
 
@@ -312,7 +312,7 @@ $htmlstr='
 					$selected = 'selected="selected"';
 				else
 					$selected = '';
-				$htmlstr .= '<option value="'.$berechtigung->berechtigung_kurzbz.'"  title="'.$berechtigung->beschreibung.'" '.$selected.'>'.$berechtigung->berechtigung_kurzbz.'</option>';
+				$htmlstr .= '<option value="'.$berechtigung->berechtigung_kurzbz.'"  title="'.htmlentities($berechtigung->beschreibung).'" '.$selected.'>'.$berechtigung->berechtigung_kurzbz.'</option>';
 			}
 			$htmlstr .= '</select>
 			<input type="checkbox" name="userOnly" ' . ($userOnly == true ? 'checked' : '') . '> Nur User
@@ -422,13 +422,13 @@ if(isset($_GET['searchstr']))
 if($berechtigung_kurzbz != '')
 {
 	$berechtigungen = new benutzerberechtigung();
-	
-	// Wenn $userOnly false ist, werden die  Rollen und Funktionen ausgegeben, die das Recht beinhalten, 
-	// ansonsten werden die Rollen und Funktionen auf User aufgelöst und nur User ausgegeben 
-	if ($userOnly == false) 
-	{ 
+
+	// Wenn $userOnly false ist, werden die  Rollen und Funktionen ausgegeben, die das Recht beinhalten,
+	// ansonsten werden die Rollen und Funktionen auf User aufgelöst und nur User ausgegeben
+	if ($userOnly == false)
+	{
 		$berechtigungen->getBenutzerFromBerechtigung($berechtigung_kurzbz);
-	
+
 		if(isset($berechtigungen->result) && count($berechtigungen->result) != 0)
 		{
 			$htmlstr .= "<h3>".$berechtigung_kurzbz."</h3>\n";
@@ -444,16 +444,16 @@ if($berechtigung_kurzbz != '')
 							<th data-value='Aktiv'>Status</th>
 							<th>Aktion</th>";
 			$htmlstr .= "</tr></thead><tbody>\n";
-	
+
 			foreach($berechtigungen->result as $row)
 			{
 				$benutzer = new benutzer();
 				$benutzer->load($row->uid);
 
 				$organisationseinheit = new organisationseinheit($row->oe_kurzbz);
-	
+
 				$heute = strtotime(date('Y-m-d'));
-	
+
 				if ($row->ende!='' && strtotime($row->ende) < $heute)
 				{
 					$status = '<div class="buttonRed"></div>';
@@ -466,7 +466,7 @@ if($berechtigung_kurzbz != '')
 				{
 					$status = '<div class="buttonGreen"></div>';
 				}
-	
+
 				$htmlstr .= '	<tr>';
 				$htmlstr .= '		<td>'.($row->rolle_kurzbz != ''?$row->rolle_kurzbz:'').'</td>';
 				$htmlstr .= '		<td>'.($row->funktion_kurzbz != ''?$row->funktion_kurzbz:'').'</td>';
@@ -483,7 +483,7 @@ if($berechtigung_kurzbz != '')
 					$htmlstr .= '		<td><a href="benutzerberechtigung_details.php?funktion_kurzbz='.$row->funktion_kurzbz.'" target="vilesci_detail">Funktionsrechte bearbeiten</a></td>';
 				elseif ($row->rolle_kurzbz != '')
 					$htmlstr .= '		<td><a href="berechtigungrolle.php?rolle_kurzbz='.$row->rolle_kurzbz.'" target="vilesci_detail">Rollenrechte bearbeiten</a></td>';
-	
+
 				$htmlstr .= '	</tr>';
 			}
 			$htmlstr .= '</tbody></table>';
@@ -493,63 +493,63 @@ if($berechtigung_kurzbz != '')
 			$htmlstr .= "Für diese Berechtigung sind keine Einträge vorhanden";
 		}
 	}
-	else  
-	{ 
-		$berechtigungen_array = array(); 
-		$berechtigungen->getBenutzerFromBerechtigung($berechtigung_kurzbz); 
+	else
+	{
+		$berechtigungen_array = array();
+		$berechtigungen->getBenutzerFromBerechtigung($berechtigung_kurzbz);
 
-		if (isset($berechtigungen->result) && count($berechtigungen->result) != 0) 
-		{ 
-			foreach ($berechtigungen->result as $row) 
-			{ 
-				if ($row->uid != '') 
-				{ 
-					$berechtigungen_array[] = array('uid' => $row->uid, 
-													'art' => $row->art, 
-													'start' => $row->start, 
-													'ende' => $row->ende, 
-													'oe_kurzbz' => $row->oe_kurzbz, 
-													'rolle_kurzbz' => '', 
-													'funktion_kurzbz' => ''); 
-				} 
-				if ($row->rolle_kurzbz != '') 
-				{ 
-					$user_rolleberechtigung = new benutzerberechtigung(); 
-					$user_rolleberechtigung->getBenutzerFromRolle($row->rolle_kurzbz); 
-					foreach ($user_rolleberechtigung->result as $row_rolle) 
-					{ 
-						$berechtigungen_array[] = array('uid' => $row_rolle->uid, 
-														'art' => $row_rolle->art, 
-														'start' => $row_rolle->start, 
-														'ende' => $row_rolle->ende, 
-														'oe_kurzbz' => $row_rolle->oe_kurzbz, 
-														'rolle_kurzbz' => $row_rolle->rolle_kurzbz, 
-														'funktion_kurzbz' => $row->funktion_kurzbz); 
-					} 
-				} 
-				if ($row->funktion_kurzbz != '') 
-				{ 
-					$user_funktion = new benutzerfunktion(); 
-					$user_funktion->getBenutzerFunktionen($row->funktion_kurzbz); 
-					foreach ($user_funktion->result as $row_funktion) 
-					{ 
-						$berechtigungen_array[] = array('uid' => $row_funktion->uid, 
-														'art' => $row->art, 
-														'start' => $row->start, 
-														'ende' => $row->ende, 
-														'oe_kurzbz' => $row_funktion->oe_kurzbz, 
-														'rolle_kurzbz' => '', 
-														'funktion_kurzbz' => $row->funktion_kurzbz); 
-					} 
-				} 
-			} 
-//			 var_dump($berechtigungen_array);exit; 
-			// Benutzer der Rolle auflösen 
-			foreach ($berechtigungen->result as $row) 
-			{ 
-				$user_rolleberechtigung = new benutzerberechtigung(); 
-				$user_rolleberechtigung->getBenutzerFromRolle($row->rolle_kurzbz); 
-			} 
+		if (isset($berechtigungen->result) && count($berechtigungen->result) != 0)
+		{
+			foreach ($berechtigungen->result as $row)
+			{
+				if ($row->uid != '')
+				{
+					$berechtigungen_array[] = array('uid' => $row->uid,
+													'art' => $row->art,
+													'start' => $row->start,
+													'ende' => $row->ende,
+													'oe_kurzbz' => $row->oe_kurzbz,
+													'rolle_kurzbz' => '',
+													'funktion_kurzbz' => '');
+				}
+				if ($row->rolle_kurzbz != '')
+				{
+					$user_rolleberechtigung = new benutzerberechtigung();
+					$user_rolleberechtigung->getBenutzerFromRolle($row->rolle_kurzbz);
+					foreach ($user_rolleberechtigung->result as $row_rolle)
+					{
+						$berechtigungen_array[] = array('uid' => $row_rolle->uid,
+														'art' => $row_rolle->art,
+														'start' => $row_rolle->start,
+														'ende' => $row_rolle->ende,
+														'oe_kurzbz' => $row_rolle->oe_kurzbz,
+														'rolle_kurzbz' => $row_rolle->rolle_kurzbz,
+														'funktion_kurzbz' => $row->funktion_kurzbz);
+					}
+				}
+				if ($row->funktion_kurzbz != '')
+				{
+					$user_funktion = new benutzerfunktion();
+					$user_funktion->getBenutzerFunktionen($row->funktion_kurzbz);
+					foreach ($user_funktion->result as $row_funktion)
+					{
+						$berechtigungen_array[] = array('uid' => $row_funktion->uid,
+														'art' => $row->art,
+														'start' => $row->start,
+														'ende' => $row->ende,
+														'oe_kurzbz' => $row_funktion->oe_kurzbz,
+														'rolle_kurzbz' => '',
+														'funktion_kurzbz' => $row->funktion_kurzbz);
+					}
+				}
+			}
+//			 var_dump($berechtigungen_array);exit;
+			// Benutzer der Rolle auflösen
+			foreach ($berechtigungen->result as $row)
+			{
+				$user_rolleberechtigung = new benutzerberechtigung();
+				$user_rolleberechtigung->getBenutzerFromRolle($row->rolle_kurzbz);
+			}
 
 			// Anzahl uniquer UIDs ermitteln
 			$berechtigungen_array_uids = array_map(function ($each)
@@ -560,60 +560,60 @@ if($berechtigung_kurzbz != '')
 			$htmlstr .= "<h3>".$berechtigung_kurzbz."</h3>\n";
 			$htmlstr .= "<div style='font-size: 9pt'>".count($berechtigungen_array)." Einträge</div>";
 			$htmlstr .= "<div style='font-size: 9pt'>".count(array_unique($berechtigungen_array_uids))." UIDs</div>";
-			$htmlstr .= "<table id='t4' class='tablesorter'><thead><tr>\n"; 
-			$htmlstr .= "	<th>Nachname</th> 
-							<th>Vorname</th> 
-							<th>UID</th> 
-							<th>Art</th> 
-							<th>OE_Kurzbz</th> 
-							<th>Rolle</th> 
-							<th>Funktion</th> 
-							<th>Benutzer Aktiv</th> 
-							<th>Status</th> 
-							<th>Aktion</th>"; 
-			$htmlstr .= "</tr></thead><tbody>\n"; 
-			 
-			foreach ($berechtigungen_array as $key => $row) 
-			{ 
-				$benutzer = new benutzer(); 
-				$benutzer->load($row['uid']); 
-				 
-				$organisationseinheit = new organisationseinheit($row['oe_kurzbz']); 
-				 
-				$heute = strtotime(date('Y-m-d')); 
-				 
-				if ($row['ende'] != '' && strtotime($row['ende']) < $heute) 
-				{ 
-					$status = '<div class="buttonRed"></div>'; 
-				} 
-				elseif ($row['start'] != '' && strtotime($row['start']) > $heute) 
-				{ 
-					$status = '<div class="buttonYellow"></div>'; 
-				} 
-				else 
-				{ 
-					$status = '<div class="buttonGreen"></div>'; 
-				} 
-				 
-				$htmlstr .= '	<tr>'; 
-				$htmlstr .= '		<td>' . ($benutzer->nachname != '' ? $benutzer->nachname : '') . '</td>'; 
-				$htmlstr .= '		<td>' . ($benutzer->vorname != '' ? $benutzer->vorname : '') . '</td>'; 
-				$htmlstr .= '		<td>' . ($row['uid'] != '' ? $row['uid'] : '') . '</td>'; 
-				$htmlstr .= '		<td>' . $row['art'] . '</td>'; 
-				$htmlstr .= '		<td>' . $organisationseinheit->organisationseinheittyp_kurzbz . ' ' .$organisationseinheit->bezeichnung . '</td>'; 
-				$htmlstr .= '		<td>' . $row['rolle_kurzbz'] . '</td>'; 
-				$htmlstr .= '		<td>' . $row['funktion_kurzbz'] . '</td>'; 
-				$htmlstr .= '		<td>' . (isset($row['uid']) ? $benutzer->bnaktiv ? 'Ja' : 'Nein' : '') . '</td>'; 
-				$htmlstr .= '		<td align="center">' . $status . '</td>'; 
-				$htmlstr .= '		<td><a href="benutzerberechtigung_details.php?uid=' . $row['uid'] . '" target="vilesci_detail">Benutzerrechte bearbeiten</a></td>';				 
-				$htmlstr .= '	</tr>'; 
-			} 
-			$htmlstr .= '</tbody></table>'; 
-		} 
-		else 
-		{ 
-			$htmlstr .= "Für diese Berechtigung sind keine Einträge vorhanden"; 
-		} 
+			$htmlstr .= "<table id='t4' class='tablesorter'><thead><tr>\n";
+			$htmlstr .= "	<th>Nachname</th>
+							<th>Vorname</th>
+							<th>UID</th>
+							<th>Art</th>
+							<th>OE_Kurzbz</th>
+							<th>Rolle</th>
+							<th>Funktion</th>
+							<th>Benutzer Aktiv</th>
+							<th>Status</th>
+							<th>Aktion</th>";
+			$htmlstr .= "</tr></thead><tbody>\n";
+
+			foreach ($berechtigungen_array as $key => $row)
+			{
+				$benutzer = new benutzer();
+				$benutzer->load($row['uid']);
+
+				$organisationseinheit = new organisationseinheit($row['oe_kurzbz']);
+
+				$heute = strtotime(date('Y-m-d'));
+
+				if ($row['ende'] != '' && strtotime($row['ende']) < $heute)
+				{
+					$status = '<div class="buttonRed"></div>';
+				}
+				elseif ($row['start'] != '' && strtotime($row['start']) > $heute)
+				{
+					$status = '<div class="buttonYellow"></div>';
+				}
+				else
+				{
+					$status = '<div class="buttonGreen"></div>';
+				}
+
+				$htmlstr .= '	<tr>';
+				$htmlstr .= '		<td>' . ($benutzer->nachname != '' ? $benutzer->nachname : '') . '</td>';
+				$htmlstr .= '		<td>' . ($benutzer->vorname != '' ? $benutzer->vorname : '') . '</td>';
+				$htmlstr .= '		<td>' . ($row['uid'] != '' ? $row['uid'] : '') . '</td>';
+				$htmlstr .= '		<td>' . $row['art'] . '</td>';
+				$htmlstr .= '		<td>' . $organisationseinheit->organisationseinheittyp_kurzbz . ' ' .$organisationseinheit->bezeichnung . '</td>';
+				$htmlstr .= '		<td>' . $row['rolle_kurzbz'] . '</td>';
+				$htmlstr .= '		<td>' . $row['funktion_kurzbz'] . '</td>';
+				$htmlstr .= '		<td>' . (isset($row['uid']) ? $benutzer->bnaktiv ? 'Ja' : 'Nein' : '') . '</td>';
+				$htmlstr .= '		<td align="center">' . $status . '</td>';
+				$htmlstr .= '		<td><a href="benutzerberechtigung_details.php?uid=' . $row['uid'] . '" target="vilesci_detail">Benutzerrechte bearbeiten</a></td>';
+				$htmlstr .= '	</tr>';
+			}
+			$htmlstr .= '</tbody></table>';
+		}
+		else
+		{
+			$htmlstr .= "Für diese Berechtigung sind keine Einträge vorhanden";
+		}
 	}
 }
 

From 9e4401d4413aa510d1acc75f92097d97aafbe884 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 3 Nov 2025 13:14:14 +0100
Subject: [PATCH 082/101] better contrast for apps-menu-button

---
 public/js/components/LVVerwaltung/LVVerwaltung.js | 4 ++--
 public/js/components/Stv/Studentenverwaltung.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index eed4bf3c5..f3edfe007 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -254,7 +254,7 @@ export default {
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
 			<div class="col-md-4 col-lg-3 col-xl-2 d-flex align-items-center">
 				<button
-					class="btn btn-outline-secondary border-0 m-1 collapsed"
+					class="btn btn-outline-light border-0 m-1 collapsed"
 					type="button"
 					data-bs-toggle="offcanvas"
 					data-bs-target="#appMenu"
@@ -267,7 +267,7 @@ export default {
 				<a class="navbar-brand me-0">LV Verwaltung</a>
 			</div>
 			<button
-				class="btn btn-outline-secondary border-0 d-md-none m-1 collapsed"
+				class="btn btn-outline-light border-0 d-md-none m-1 collapsed"
 				type="button"
 				data-bs-toggle="offcanvas"
 				data-bs-target="#sidebarMenu"
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 63511924f..a1e38875d 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -352,7 +352,7 @@ export default {
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
 			<div class="col-md-4 col-lg-3 col-xl-2 d-flex align-items-center">
 				<button
-					class="btn btn-outline-secondary border-0 m-1 collapsed"
+					class="btn btn-outline-light border-0 m-1 collapsed"
 					type="button"
 					data-bs-toggle="offcanvas"
 					data-bs-target="#appMenu"
@@ -365,7 +365,7 @@ export default {
 				<a class="navbar-brand me-0" :href="stvRoot">StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}</a>
 			</div>
 			<button
-				class="btn btn-outline-secondary border-0 d-md-none m-1 collapsed"
+				class="btn btn-outline-light border-0 d-md-none m-1 collapsed"
 				type="button"
 				data-bs-toggle="offcanvas"
 				data-bs-target="#sidebarMenu"

From 146bb5f336c0d6633baff0f6f92eacabf480cbf8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 3 Nov 2025 15:34:54 +0100
Subject: [PATCH 083/101] replace legacy lvplan link in room content with cis4
 lvplan link

---
 .../components/Cis/Cms/Content_types/Raum_contentmittitel.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
index 8373b6ac9..902a05aca 100644
--- a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
+++ b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
@@ -100,6 +100,11 @@ export default {
 				link_element.href = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/CisVue/Cms/getRoomInformation/" + room_name;
 				link_element.appendChild(title.cloneNode(true));
 				title.replaceWith(link_element);
+
+				let lvplanlinks = document.querySelectorAll('.menubox a[href*="stpl_week.php"]');
+				for(let lvplanlink of lvplanlinks) {
+					lvplanlink.href = link_element.href;
+				}
 			}
 			else
 			{

From 9601c8bdd2ed0c4f3ce132495477079627d2c601 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 4 Nov 2025 11:40:08 +0100
Subject: [PATCH 084/101] add personenkennzeichen & matrikelnummer to stv
 search config

---
 application/config/searchstv.php | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/application/config/searchstv.php b/application/config/searchstv.php
index 96c118ac8..d507f7250 100644
--- a/application/config/searchstv.php
+++ b/application/config/searchstv.php
@@ -7,5 +7,43 @@ $CI =& get_instance();
 
 
 $config['student'] = $CI->config->item('student', 'search');
+$config['student']['searchfields']['pkz'] = [
+	'alias' => ['personenkennzeichen', 'personalid'],
+	'comparison' => 'equals',
+	'field' => 'matrikelnr'
+];
+$config['student']['searchfields']['matrnr'] = [
+	'alias' => ['matrikelnr', 'matrikelnummer', 'matrno', 'matriculationno', 'matriculationnumber', 'studno', 'studentno', 'studentnumber'],
+	'comparison' => 'equals',
+	'field' => 'matr_nr',
+	'join' => [
+		[
+			'table' => "public.tbl_prestudent",
+			'using' => "prestudent_id"
+		],
+		[
+			'table' => "public.tbl_person",
+			'using' => "person_id"
+		]
+	]
+];
 
 $config['prestudent'] = $CI->config->item('prestudent', 'search');
+$config['prestudent']['searchfields']['pkz'] = [
+	'alias' => ['personenkennzeichen', 'personalid'],
+	'comparison' => 'equals',
+	'field' => 'matrikelnr',
+	'join' => [
+		'table' => "public.tbl_student",
+		'using' => "prestudent_id"
+	]
+];
+$config['prestudent']['searchfields']['matrnr'] = [
+	'alias' => ['matrikelnr', 'matrikelnummer', 'matrno', 'matriculationno', 'matriculationnumber', 'studno', 'studentno', 'studentnumber'],
+	'comparison' => 'equals',
+	'field' => 'matr_nr',
+	'join' => [
+		'table' => "public.tbl_person",
+		'using' => "person_id"
+	]
+];

From 0893ec30d9253d41ddc17ce13295411f39720633 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 4 Nov 2025 15:26:18 +0100
Subject: [PATCH 085/101] Bugfix: use plainto_tsquery instead of to_tsquery to
 avoid errors on special chars

---
 application/config/searchfunctions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/config/searchfunctions.php b/application/config/searchfunctions.php
index 276652997..ddf7692d5 100644
--- a/application/config/searchfunctions.php
+++ b/application/config/searchfunctions.php
@@ -29,7 +29,7 @@ $config['similar'] = [
 
 $config['vector'] = [
 	'priority' => 1,
-	'rank' => "ts_rank({field}, to_tsquery('simple', {word}))",
-	'compare' => "to_tsquery('simple', {word}) @@ {field}"
+	'rank' => "ts_rank({field}, plainto_tsquery('simple', {word}))",
+	'compare' => "plainto_tsquery('simple', {word}) @@ {field}"
 ];
 

From 67d41f1df92751570e1989c4b02987fd003d1507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 5 Nov 2025 14:26:45 +0100
Subject: [PATCH 086/101] =?UTF-8?q?Note=20Bestanden=20am=20Diploamsuppleme?=
 =?UTF-8?q?nt=20priorisiert=20damit=20diese=20als=20"bessere"=20Note=20als?=
 =?UTF-8?q?=20Nicht=20Gen=C3=BCgend=20gewertet=20wird?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rdf/diplomasupplement.xml.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rdf/diplomasupplement.xml.php b/rdf/diplomasupplement.xml.php
index 41d046a99..d5eb11c26 100644
--- a/rdf/diplomasupplement.xml.php
+++ b/rdf/diplomasupplement.xml.php
@@ -1160,12 +1160,13 @@ function checkNote($note_alt, $note_neu)
 		'4' => 'ea',
 		'5' => 'tg',
 		'6' => 'met',
-		'7' => 'ar',
-		'8' => 'nb',
-		'9' => '5',
-		'10' => 'nea');
+		'7' => 'b',
+		'8' => 'ar',
+		'9' => 'nb',
+		'10' => '5',
+		'11' => 'nea');
 
-	for($i = 0; $i<=9; $i++)
+	for($i = 0; $i<=11; $i++)
 	{
 		if($note_alt == $arrayNotenPriority[$i])
 			$priority_alt = $i;

From 9e40c6b21ffc2a4d7fe36231fe0962527bb1527a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 5 Nov 2025 15:41:17 +0100
Subject: [PATCH 087/101] declaration, import & binding of capitalize function
 from StringHelpers.js;

---
 public/js/apps/Dashboard/Fhc.js    | 3 ++-
 public/js/helpers/StringHelpers.js | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 public/js/helpers/StringHelpers.js

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 093ad815b..190ed1a93 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -19,6 +19,7 @@ import Studium from "../../components/Cis/Studium/Studium.js";
 
 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
+import {capitalize} from "../../helpers/StringHelpers.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -320,7 +321,7 @@ const app = Vue.createApp({
 
 // kind of a bandaid for bad css on some pages to avoid horizontal scroll
 setScrollbarWidth();
-
+app.config.globalProperties.$capitalize = capitalize;
 app.use(router);
 app.use(primevue.config.default, {
 	zIndex: {
diff --git a/public/js/helpers/StringHelpers.js b/public/js/helpers/StringHelpers.js
new file mode 100644
index 000000000..a67d0138f
--- /dev/null
+++ b/public/js/helpers/StringHelpers.js
@@ -0,0 +1,4 @@
+export function capitalize(string) {
+	if (!string) return '';
+	return string[0].toUpperCase() + string.slice(1);
+}
\ No newline at end of file

From 74a00a4ce069830b7dd1623339aba96cdece563e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 5 Nov 2025 17:26:39 +0100
Subject: [PATCH 088/101] changes according to userStory #68983

---
 .../api/frontend/v1/stv/Dokumente.php         | 67 +++++++++++++------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index e6f6f4351..27ccccac5 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -589,12 +589,16 @@ class Dokumente extends FHCAPI_Controller
 		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
 
 		$documents = [
-			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null),
+
 			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uid, 20, null),
-			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uid, 21, null),
-			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uid, 40, null),
-			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uid, 41, null),
-			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uid", $uid,100, "zutrittskarte.php"),
+			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Zweisprachig", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uid, 21, null),
+
+			buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 25, null),
+			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 26, null),
+
+			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uid, 50, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uid, 51, null),
+			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uid", $uid,200, "zutrittskarte.php"),
 			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uid, 60, null),
 			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uid, 61, null),
 
@@ -616,10 +620,11 @@ class Dokumente extends FHCAPI_Controller
 				]
 			],
 
-			$this->loadDropDownEntriesFinalExam($hasPermissionOutputformat, $stgTyp, $uid),
+			//Bakkzeugnis bzw. Diplomzeugnis is just shown in tab final_exam
+			buildDropdownEntryPrintArray("zeugnis", "Zeugnis", "xml=zeugnis.rdf.php&xsl=Zeugnis&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uid, 121, null),
+			buildDropdownEntryPrintArray("zeugnis_en", "Zeugnis Englisch", "xml=zeugnis.rdf.php&xsl=ZeugnisEng&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uid, 122, null),
+
 
-			buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 80, null),
-			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 81, null)
 		];
 
 		Events::trigger('DocumentGenerationDropDown',
@@ -632,15 +637,18 @@ class Dokumente extends FHCAPI_Controller
 			$studiengang_kz
 		);
 
+		$extraEntries = $this->loadDropDownEntriesBakkOrDipl($stgTyp, $uid);
+
+		$documents = array_merge($documents, $extraEntries);
+
 		usort($documents, function ($a, $b) {
 			$orderA = isset($a['order']) ? (int)$a['order'] : PHP_INT_MAX;
 			$orderB = isset($b['order']) ? (int)$b['order'] : PHP_INT_MAX;
 			return $orderA <=> $orderB;
 		});
 
-
 		$this->terminateWithSuccess($documents);
-		return $documents || null;
+		//return $documents || null;
 	}
 
 	public function getDocumentDropDownMulti($studiensemester_kurzbz,$studiengang_kz)
@@ -678,9 +686,9 @@ class Dokumente extends FHCAPI_Controller
 			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uidString, 10, null),
 			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uidString, 20, null),
 			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uidString, 21, null),
-			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uidString, 40, null),
-			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uidString, 41, null),
-			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uidString", $uidString,100, "zutrittskarte.php"),
+			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uidString, 50, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uidString, 51, null),
+			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uidString", $uidString,200, "zutrittskarte.php"),
 			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uidString, 60, null),
 			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uidString, 61, null),
 
@@ -703,13 +711,9 @@ class Dokumente extends FHCAPI_Controller
 				]
 			],
 
-			$this->loadDropDownEntriesFinalExam($hasPermissionOutputformat, $stgTyp, $uidString),
-
-			//TODO(Manu) also in Fas multi not working
-/*			buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uidString, 80, null),
-			*/
-
-			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uidString, 81, null)
+			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uidString, 35, null),
+			buildDropdownEntryPrintArray("zeugnis", "Zeugnis", "xml=zeugnis.rdf.php&xsl=Zeugnis&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uidString, 121, null),
+			buildDropdownEntryPrintArray("zeugnis_en", "Zeugnis Englisch", "xml=zeugnis.rdf.php&xsl=ZeugnisEng&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uidString, 122, null),
 		];
 
 		Events::trigger('DocumentGenerationDropDownMulti',
@@ -722,6 +726,10 @@ class Dokumente extends FHCAPI_Controller
 			$studiengang_kz
 		);
 
+		$extraEntries = $this->loadDropDownEntriesBakkOrDipl($stgTyp, $uidString);
+
+		$documents = array_merge($documents, $extraEntries);
+
 		usort($documents, function ($a, $b) {
 			$orderA = isset($a['order']) ? (int)$a['order'] : PHP_INT_MAX;
 			$orderB = isset($b['order']) ? (int)$b['order'] : PHP_INT_MAX;
@@ -960,4 +968,23 @@ class Dokumente extends FHCAPI_Controller
 		];
 	}
 
+	private function loadDropDownEntriesBakkOrDipl($stgTyp, $uid)
+	{
+		$entries = [];
+
+		if ($stgTyp == 'b')
+		{
+			$entries[] = buildDropdownEntryPrintArray("bakkurkunde", "Bakkurkunde", "xml=abschlusspruefung.rdf.php&xsl=Bakkurkunde&output=pdf", $uid, 22, null);
+			$entries[] = buildDropdownEntryPrintArray("bakkurkundeEng", "Bakkurkunde Englisch", "xml=abschlusspruefung.rdf.php&xsl=BakkurkundeEng&output=pdf", $uid, 23, null);
+		}
+
+		if ($stgTyp == 'm' || $stgTyp == 'd')
+		{
+			$entries[] = buildDropdownEntryPrintArray("diplomurkunde", "Diplomurkunde", "xml=abschlusspruefung.rdf.php&xsl=Diplomurkunde&output=pdf", $uid, 27, null);
+			$entries[] = buildDropdownEntryPrintArray("diplomurkundeEng", "Diplomurkunde Englisch", "xml=abschlusspruefung.rdf.php&xsl=DiplomurkundeEng&output=pdf", $uid, 28, null);
+		}
+
+		return $entries;
+	}
+
 }

From 5678c18619a813772c7ed5a8151eb62039688991 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 7 Nov 2025 00:51:07 +0100
Subject: [PATCH 089/101] keepemailunverified parameter: email is passed even
 if unverified

---
 .../api/frontend/v1/stv/Student.php           | 24 ++++++++++++-----
 .../views/system/infocenter/stammdaten.php    | 18 ++++++++-----
 .../Studentenverwaltung/Details/Details.js    |  2 +-
 rdf/student.rdf.php                           | 26 ++++++++++++++++---
 4 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index f2845572f..2f8f0fe4a 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -111,16 +111,28 @@ class Student extends FHCAPI_Controller
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(
 				"(
-					SELECT kontakt 
-					FROM public.tbl_kontakt 
-					WHERE kontakttyp='email' 
-					AND person_id=p.person_id 
-					AND zustellung 
-					ORDER BY kontakt_id 
+					SELECT kontakt
+					FROM public.tbl_kontakt
+					WHERE kontakttyp='email'
+					AND person_id=p.person_id
+					AND zustellung
+					ORDER BY kontakt_id
 					LIMIT 1
 				) AS email_privat",
 				false
 			);
+			$this->PrestudentModel->addSelect(
+				"(
+					SELECT kontakt
+					FROM public.tbl_kontakt
+					WHERE kontakttyp='email_unverifiziert'
+					AND person_id=p.person_id
+					AND zustellung
+					ORDER BY kontakt_id
+					LIMIT 1
+				) AS email_privat_unverified",
+				false
+			);
 		}
 		$this->PrestudentModel->addSelect(
 			"(
diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php
index 83961dd91..c632b079f 100644
--- a/application/views/system/infocenter/stammdaten.php
+++ b/application/views/system/infocenter/stammdaten.php
@@ -106,6 +106,7 @@
 			<tbody>
 			<?php
 			$lastMailAdress = '';
+			$lastUnverifiedMailAdress = '';
 			foreach ($stammdaten->kontakte as $kontakt): ?>
 				<tr>
 				<?php if ($kontakt->kontakttyp === 'email'): ?>
@@ -119,14 +120,16 @@
 						<?php echo '<span class="kontakt '.$kontakt->kontakttyp.'" data-id="'. $kontakt->kontakt_id .'" data-value="' . $kontakt->kontakt .'">';?>
 						<?php if ($kontakt->kontakttyp === 'email'): ?>
 							<a href="mailto:<?php echo $kontakt->kontakt; ?>" target="_top">
-							<?php $lastMailAdress = $kontakt->kontakt;
+							<?php $lastMailAdress = $kontakt->kontakt; ?>
+						<?php elseif ($kontakt->kontakttyp === 'email_unverifiziert'): ?>
+							<?php $lastUnverifiedMailAdress = $kontakt->kontakt;
 							endif;
 							echo $kontakt->kontakt;
-							if ($kontakt->kontakttyp === 'email'):
+						if ($kontakt->kontakttyp === 'email'):
 							?>
 							</a>
-							<?php endif; ?>
-					<?php echo '</span>'?>
+						<?php endif; ?>
+						<?php echo '</span>'?>
 					</td>
 					<td><?php echo $kontakt->anmerkung; ?></td>
 				</tr>
@@ -140,9 +143,9 @@
 						<?php if (isset($adresse)): ?>
 							<div class="row adresse col-sm-12" data-id="<?php echo $adresse->adresse_id ?>">
 								<div class="float-left" data-value="<?php echo $adresse->strasse ?>" data-type="strasse"><?php echo $adresse->strasse ?></div>
-								
+
 								<div class="float-left" data-value="<?php echo $adresse->plz ?>" data-type="plz"><?php echo $adresse->plz ?></div>
-								
+
 								<div class="float-left" data-value="<?php echo $adresse->ort ?>" data-type="ort"><?php echo $adresse->ort ?></div>
 
 							<?php if (isset($adresse->nationkurztext)): ?>
@@ -182,7 +185,8 @@
 			</div>
 			<?php if (isset($stammdaten->zugangscode)): ?>
 				<div class="col-xs-6 text-right">
-					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode).'&emailAdresse='.$lastMailAdress.'&keepEmailUnverified=true' ?>"
+					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode)
+					.'&emailAdresse='.(isEmptyString($lastMailAdress)?$lastUnverifiedMailAdress:$lastMailAdress).'&keepEmailUnverified=true' ?>"
 					   target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;<?php echo  $this->p->t('infocenter','zugangBewerbung') ?></a>
 				</div>
 			<?php endif; ?>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 5bb673d1a..d0fbf7447 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -186,7 +186,7 @@ export default {
 						<label>{{$p.t('global', 'zugangscode')}}</label>
 						<div class="align-self-center">
 							<span class="form-text">
-								<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat + '&keepEmailUnverified=true'" target="_blank">{{data.zugangscode}}</a>
+								<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + (data.email_privat == null ? data.email_privat_unverified : data.email_privat) + '&keepEmailUnverified=true'" target="_blank">{{data.zugangscode}}</a>
 							</span>
 						</div>
 					</div>
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index c0d8bdd5d..31e6c7885 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -279,12 +279,32 @@ function draw_content($row)
 	$status='';
 
 	$mail_privat = '';
-	$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=".$db->db_add_param($row->person_id)." AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
+	$mail_unverifiziert = '';
+
+	$qry_mail = "
+		SELECT
+			DISTINCT ON (kontakttyp) kontakt, kontakttyp
+		FROM
+			public.tbl_kontakt
+		WHERE
+			zustellung=TRUE
+			AND kontakttyp IN ('email', 'email_unverifiziert')
+			AND person_id = ".$db->db_add_param($row->person_id)."
+		ORDER BY
+			kontakttyp, kontakt_id DESC";
+
 	if($db->db_query($qry_mail))
 	{
 		if($row_mail = $db->db_fetch_object())
 		{
-			$mail_privat = $row_mail->kontakt;
+			if ($row_mail->kontakttyp == 'email')
+			{
+				$mail_privat = $row_mail->kontakt;
+			}
+			elseif ($row_mail->kontakttyp == 'email_unverifiziert')
+			{
+				$mail_unverifiziert = $row_mail->kontakt;
+			}
 		}
 	}
 
@@ -366,7 +386,7 @@ function draw_content($row)
 			<STUDENT:mail_privat><![CDATA['.$mail_privat.']]></STUDENT:mail_privat>
 			<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>
 			<STUDENT:zugangscode><![CDATA['.$row->zugangscode.']]></STUDENT:zugangscode>
-			<STUDENT:link_bewerbungstool><![CDATA['.CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.$row->zugangscode.'&emailAdresse='.$mail_privat.'&keepEmailUnverified=true]]></STUDENT:link_bewerbungstool>
+			<STUDENT:link_bewerbungstool><![CDATA['.CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.$row->zugangscode.'&emailAdresse='.($mail_privat == '' ? $mail_unverifiziert : $mail_privat).'&keepEmailUnverified=true]]></STUDENT:link_bewerbungstool>
 			<STUDENT:bpk><![CDATA['.$row->bpk.']]></STUDENT:bpk>
 
 			<STUDENT:aktiv><![CDATA['.$aktiv.']]></STUDENT:aktiv>

From f15932964fdaf208d215b9a542cacab3abaa74f4 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 7 Nov 2025 01:06:22 +0100
Subject: [PATCH 090/101] Studierendenverwaltung email: descending order
 kontakt_id

---
 application/controllers/api/frontend/v1/stv/Student.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 2f8f0fe4a..ef0a39135 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -116,7 +116,7 @@ class Student extends FHCAPI_Controller
 					WHERE kontakttyp='email'
 					AND person_id=p.person_id
 					AND zustellung
-					ORDER BY kontakt_id
+					ORDER BY kontakt_id DESC
 					LIMIT 1
 				) AS email_privat",
 				false
@@ -128,7 +128,7 @@ class Student extends FHCAPI_Controller
 					WHERE kontakttyp='email_unverifiziert'
 					AND person_id=p.person_id
 					AND zustellung
-					ORDER BY kontakt_id
+					ORDER BY kontakt_id DESC
 					LIMIT 1
 				) AS email_privat_unverified",
 				false

From a9e90cf10d17fac8b9e60318f6037806ddf3ee54 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 11 Nov 2025 13:01:48 +0100
Subject: [PATCH 091/101] add absoluteJsImportUrl helper function - to generate
 absolute urls with fhcomplete_build_version for dynamic imports - and use it
 in stv config

---
 .../api/frontend/v1/stv/Config.php            | 56 +++++++++----------
 application/helpers/hlp_header_helper.php     |  7 +++
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 363bf3ca2..97d626246 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -213,21 +213,21 @@ class Config extends FHCAPI_Controller
 
 		$result['details'] = [
 			'title' => $this->p->t('stv', 'tab_details'),
-			'component' => './Stv/Studentenverwaltung/Details/Details.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Details.js'),
 			'config' => $config['details']
 		];
 
 		$result['notes'] = [
 			'title' => $this->p->t('stv', 'tab_notes'),
-			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Notizen.js'),
 			'config'	=> $config['notes'],
 			'showSuffix' => ($config['notes']['showCountNotes'] ?? false),
-			'suffixhelper' => APP_ROOT . 'public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
+			'suffixhelper' => absoluteJsImportUrl('public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js')
 		];
 
 		$result['contact'] = [
 			'title' => $this->p->t('stv', 'tab_contact'),
-			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js'),
 			'config' => [
 				'showBankaccount' => $this->permissionlib->isBerechtigt('mitarbeiter/bankdaten')
 					|| $this->permissionlib->isBerechtigt('student/bankdaten')
@@ -235,20 +235,20 @@ class Config extends FHCAPI_Controller
 		];
 		$result['prestudent'] = [
 			'title' => $this->p->t('stv', 'tab_prestudent'),
-			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js'),
 			'config' => $config['prestudent']
 		];
 		$result['status'] = [
 			'title' => 'Status',
-			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js')
 		];
 		$result['documents'] = [
 			'title' => $this->p->t('stv', 'tab_documents'),
-			'component' => './Stv/Studentenverwaltung/Details/Dokumente.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js')
 		];
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
-			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Konto.js'),
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
@@ -260,23 +260,23 @@ class Config extends FHCAPI_Controller
 		];
 		$result['resources'] = [
 			'title' => $this->p->t('stv', 'tab_resources'),
-			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js'),
 			'showOnlyWithUid' => true
 		];
 		$result['groups'] = [
 			'title' => $this->p->t('stv', 'tab_groups'),
-			'component' => './Stv/Studentenverwaltung/Details/Groups.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Groups.js'),
 			'showOnlyWithUid' => true
 		];
 		$result['messages'] = [
 			'title' => $this->p->t('stv', 'tab_messages'),
-			'component' => './Stv/Studentenverwaltung/Details/Messages.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Messages.js'),
 			'showOnlyWithUid' => true
 		];
 
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
-			'component' => './Stv/Studentenverwaltung/Details/Noten.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Noten.js'),
 			'showOnlyWithUid' => true,
 			'config' => [
 				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
@@ -289,26 +289,26 @@ class Config extends FHCAPI_Controller
 
 		$result['exam'] = [
 			'title' => $this->p->t('stv', 'tab_exam'),
-			'component' => './Stv/Studentenverwaltung/Details/Pruefung.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Pruefung.js'),
 			'showOnlyWithUid' => true
 		];
 
 		$result['exemptions'] = [
 			'title' => $this->p->t('lehre', 'anrechnungen'),
-			'component' => './Stv/Studentenverwaltung/Details/Anrechnungen.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js'),
 			'config' => $config['exemptions']
 		];
 
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
-			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung.js'),
 			'showOnlyWithUid' => true,
 			'config' => $config['finalexam']
 		];
 
 		$result['projektarbeit'] = [
 			'title' => $this->p->t('stv', 'tab_projektarbeit'),
-			'component' => './Stv/Studentenverwaltung/Details/Projektarbeit.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit.js'),
 			'config' => array_merge(
 				$config['projektarbeit'],
 				['showVertragsdetails' =>
@@ -318,13 +318,13 @@ class Config extends FHCAPI_Controller
 
 		$result['mobility'] = [
 			'title' => $this->p->t('stv', 'tab_mobility'),
-			'component' => './Stv/Studentenverwaltung/Details/Mobility.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Mobility.js'),
 			'showOnlyWithUid' => true
 		];
 
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Archiv.js'),
 			'config' => [
 				'showEdit' => $this->permissionlib->isBerechtigt('admin')
 			]
@@ -332,23 +332,23 @@ class Config extends FHCAPI_Controller
 
 		$result['jointstudies'] = [
 			'title' => $this->p->t('stv', 'tab_jointstudies'),
-			'component' => './Stv/Studentenverwaltung/Details/JointStudies.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js'),
 			'showOnlyWithUid' => true
 		];
 
 		$result['coursedates'] = [
 			'title' => $this->p->t('stv', 'tab_courseDates'),
-			'component' => './Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js')
 		];
 
 		$result['admissionDates'] = [
 			'title' => $this->p->t('stv', 'tab_admissionDates'),
-			'component' => './Stv/Studentenverwaltung/Details/Aufnahmetermine.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js')
 		];
 
 		$result['functions'] = [
 			'title' => $this->p->t('stv', 'tab_functions'),
-			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js'),
 			'showOnlyWithUid' => true
 		];
 
@@ -367,7 +367,7 @@ class Config extends FHCAPI_Controller
 		$config = $this->config->item('tabs');
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
-			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Konto.js'),
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
@@ -379,12 +379,12 @@ class Config extends FHCAPI_Controller
 		];
 		$result['groups'] = [
 			'title' => $this->p->t('stv', 'tab_groups'),
-			'component' => './Stv/Studentenverwaltung/Details/Groups.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Groups.js'),
 			'showOnlyWithUid' => true
 		];
 		$result['status'] = [
 			'title' => 'Status',
-			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js'),
 			'config' => [
 				'changeStatusToAbbrecherStgl' => $this->permissionlib->isBerechtigt('admin'),
 				'changeStatusToAbbrecherStud' => $this->permissionlib->isBerechtigt('admin'),
@@ -395,13 +395,13 @@ class Config extends FHCAPI_Controller
 		];
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
-			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung.js'),
 			'showOnlyWithUid' => true,
 			'config' => $config['finalexam']
 		];
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Archiv.js'),
 			'config' => [
 				'showEdit' => $this->permissionlib->isBerechtigt('admin')
 			]
@@ -409,7 +409,7 @@ class Config extends FHCAPI_Controller
 
 		$result['kontaktieren'] = [
 			'title' => $this->p->t('stv', 'tab_kontaktieren'),
-			'component' => './Stv/Studentenverwaltung/Details/Kontaktieren.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js'),
 		];
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index 24c02eac5..309bdedbd 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -246,3 +246,10 @@ function generateSkipLink($skipID)
 	$toPrint.='" class="fhcSkipLink" aria-label="Skip to main content"></a>';
 	echo $toPrint;
 }
+
+function absoluteJsImportUrl($relurl)
+{
+	$ci =& get_instance();
+	$url = base_url($relurl) . '?'. $ci->config->item('fhcomplete_build_version');
+	return $url;
+}
\ No newline at end of file

From 339639cc6e0609ebc1cc8c47c5e850d663418e2b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 13 Nov 2025 15:48:20 +0100
Subject: [PATCH 092/101] add Link to Lehrauftraege to apps menu in stv

---
 application/config/navigation.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/application/config/navigation.php b/application/config/navigation.php
index bb6cc50ba..f7ba8dca3 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -349,5 +349,11 @@ $config['navigation_menu']['apps'] = [
 		'description' => 'LV Verwaltung',
 		#'icon' => 'person-chalkboard',
 		'requiredPermissions' => array('admin:r', 'assistenz:r')
+	],
+	'lav' => [
+		'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
+		'description' => 'Lehraufträge',
+		#'icon' => 'person-chalkboard',
+		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r')
 	]
 ];

From 63eda8b934d5b4635e74b66480e05e3e16cc04a7 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 14 Nov 2025 08:07:39 +0100
Subject: [PATCH 093/101] addgroup/addperson immer anzeigen gruppen sortierung
 angepasst fehlende les anzeigen

---
 .../api/frontend/v1/Lehrveranstaltung.php     | 14 +++++-
 .../api/frontend/v1/lv/Lehreinheit.php        | 44 ++++++++++++++++---
 .../models/education/Lehreinheit_model.php    |  8 +++-
 .../LVVerwaltung/Details/Direktinskription.js |  5 ---
 .../LVVerwaltung/Details/Gruppen.js           |  5 ---
 .../components/LVVerwaltung/LVVerwaltung.js   |  2 +-
 .../components/LVVerwaltung/Lektor/Table.js   |  5 ---
 .../js/components/LVVerwaltung/Setup/Table.js | 18 ++++++--
 8 files changed, 73 insertions(+), 28 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehrveranstaltung.php b/application/controllers/api/frontend/v1/Lehrveranstaltung.php
index 2e254bfc8..935602391 100644
--- a/application/controllers/api/frontend/v1/Lehrveranstaltung.php
+++ b/application/controllers/api/frontend/v1/Lehrveranstaltung.php
@@ -119,7 +119,19 @@ class Lehrveranstaltung extends FHCAPI_Controller
 			if (hasData($lehreinheiten_data))
 			{
 				$lehreinheiten = getData($lehreinheiten_data);
-				$rowData->_children = $lehreinheiten;
+
+				if (!isset($row->_children))
+				{
+					$row->_children = $lehreinheiten;
+				}
+				else
+				{
+					if (!is_array($row->_children))
+					{
+						$row->_children = [$row->_children];
+					}
+					$row->_children = array_merge($row->_children, $lehreinheiten);
+				}
 			}
 
 			if (!isEmptyString($row->studienplan_lehrveranstaltung_id_parent))
diff --git a/application/controllers/api/frontend/v1/lv/Lehreinheit.php b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
index 958007901..6329d30ac 100644
--- a/application/controllers/api/frontend/v1/lv/Lehreinheit.php
+++ b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
@@ -169,6 +169,10 @@ class Lehreinheit extends FHCAPI_Controller
 		{
 			$value = $this->input->post($field);
 
+			if ($field === 'lehre')
+			{
+				$value = (bool)$value;
+			}
 			if ($value !== null)
 			{
 				$updateData[$field] = $value;
@@ -281,15 +285,43 @@ class Lehreinheit extends FHCAPI_Controller
 	public function delete()
 	{
 		$lehreinheit_id = $this->input->post('lehreinheit_id');
-		$lehreinheit = $this->checkLehreinheit($lehreinheit_id);
-		$this->checkPermission($lehreinheit->lehreinheit_id);
 
-		$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
+		$errors = array();
+		if (is_array($lehreinheit_id))
+		{
+			foreach ($lehreinheit_id as $le_id)
+			{
+				$lehreinheit = $this->checkLehreinheit($le_id);
+				$this->checkPermission($lehreinheit->lehreinheit_id);
 
-		if (isError($result))
-			$this->terminateWithValidationErrors(getError($result));
+				$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
 
-		$this->terminateWithSuccess('Erfolgreich geloescht');
+				if (isError($result))
+				{
+					$errors[] = getError($result);
+				}
+			}
+		}
+		else
+		{
+			$lehreinheit = $this->checkLehreinheit($lehreinheit_id);
+			$this->checkPermission($lehreinheit->lehreinheit_id);
+
+			$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
+
+			if (isError($result))
+				$this->terminateWithError(getError($result));
+		}
+
+		if (!isEmptyArray($errors))
+		{
+			if (count($errors) !== count($lehreinheit_id))
+				$this->terminateWithSuccess(array('errors' => $errors));
+			else
+				$this->terminateWithError($errors);
+		}
+		else
+			$this->terminateWithSuccess('Erfolgreich geloescht');
 	}
 
 	public function update()
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index e52af4cba..2f955c295 100644
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -651,7 +651,13 @@ EOSQL;
 											 ELSE NULL
 											 END
 									 END,
-								 ' '
+								 ' ' 
+									ORDER BY
+										UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz),
+										COALESCE(TRIM(tbl_lehreinheitgruppe.semester::text), ''),
+										COALESCE(TRIM(tbl_lehreinheitgruppe.verband), ''),
+										COALESCE(TRIM(tbl_lehreinheitgruppe.gruppe), ''),
+										COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, '')
 						 ) AS gruppen
 					 FROM lehre.tbl_lehreinheitgruppe
 						LEFT JOIN public.tbl_studiengang USING (studiengang_kz)
diff --git a/public/js/components/LVVerwaltung/Details/Direktinskription.js b/public/js/components/LVVerwaltung/Details/Direktinskription.js
index 268b1bf28..73e81bea6 100644
--- a/public/js/components/LVVerwaltung/Details/Direktinskription.js
+++ b/public/js/components/LVVerwaltung/Details/Direktinskription.js
@@ -62,7 +62,6 @@ export default{
 			lastSelected: null,
 			gruppen: [],
 			tabulatorEvents: [],
-			showAutocomplete: false,
 			selectedUser: null,
 			filteredUsers: [],
 			abortController: null,
@@ -150,13 +149,9 @@ export default{
 			table-only
 			:side-menu="false"
 			:reload=true
-			:new-btn-label="$p.t('lehre', 'assignPerson')"
-			new-btn-show
-			@click:new="showAutocomplete = !showAutocomplete"
 			>
 			<template #search> <!--TODO (david) Slot prüfen -->
 				<form-input
-					v-if="showAutocomplete"
 					type="autocomplete"
 					:suggestions="filteredUsers"
 					:placeholder="$p.t('lehre', 'assignPerson')"
diff --git a/public/js/components/LVVerwaltung/Details/Gruppen.js b/public/js/components/LVVerwaltung/Details/Gruppen.js
index 57dc49728..024bf6468 100644
--- a/public/js/components/LVVerwaltung/Details/Gruppen.js
+++ b/public/js/components/LVVerwaltung/Details/Gruppen.js
@@ -88,7 +88,6 @@ export default{
 	data() {
 		return{
 			tabulatorEvents: [],
-			showAutocomplete: false,
 			filteredGroups: [],
 			selectedGroup: null,
 			abortController: null
@@ -197,13 +196,9 @@ export default{
 			table-only
 			:side-menu="false"
 			:reload=true
-			:new-btn-label="$p.t('lehre', 'addGroup')"
-			new-btn-show
-			@click:new="showAutocomplete = !showAutocomplete"
 			>
 			<template #search> <!--TODO (david) Slot prüfen -->
 				<form-input
-					v-if="showAutocomplete"
 					type="autocomplete"
 					:suggestions="filteredGroups"
 					:placeholder="$p.t('lehre', 'addGroup')"
diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index 840d7b406..e5b880a68 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -39,7 +39,7 @@ export default {
 			dropdowns: this.dropdowns,
 			configShowVertragsdetails: this.config.showVertragsdetails,
 			configShowGewichtung: this.config.showGewichtung,
-			lehreinheitAnmerkungDefault: this.config.lehreinheitAnmerkungDefault,
+			lehreinheitAnmerkungDefault: (this.config.lehreinheitAnmerkungDefault || '').replace(/\\n/g, '\n'),
 			lehreinheitRaumtypDefault: this.config.lehreinheitRaumtypDefault,
 			lehreinheitRaumtypAlternativeDefault: this.config.lehreinheitRaumtypAlternativeDefault,
 
diff --git a/public/js/components/LVVerwaltung/Lektor/Table.js b/public/js/components/LVVerwaltung/Lektor/Table.js
index 461d782ed..85c39c25a 100644
--- a/public/js/components/LVVerwaltung/Lektor/Table.js
+++ b/public/js/components/LVVerwaltung/Lektor/Table.js
@@ -33,7 +33,6 @@ export default{
 					handler: this.lektorSelected
 				}
 			],
-			showAutocomplete: false,
 			filteredLektor: [],
 			selectedLektor: '',
 			abortController: null
@@ -219,13 +218,9 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
-			:new-btn-label="$p.t('lehre', 'addLektor')"
-			new-btn-show
-			@click:new="showAutocomplete = !showAutocomplete"
 			>
 		<template #search> <!--TODO (david) Slot prüfen -->
 			<form-input
-				v-if="showAutocomplete"
 				type="autocomplete"
 				:suggestions="filteredLektor"
 				:placeholder="$p.t('lehre', 'addLektor')"
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index c3fe9a8a7..830cfc9ea 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -324,7 +324,7 @@ export default {
 					{title: this.$p.t('lehre', 'lehreinheit_id'), field: "lehreinheit_id", headerFilter: true, headerFilterFuncParams: {field: 'lehreinheit_id'}, visible: false},
 					{title: this.$p.t('lehre', 'studiensemester'), field: "studiensemester_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'studiensemester_kurzbz'}, visible: false},
 					{title: this.$p.t('lehre', 'unr'), field: "unr", headerFilter: true, headerFilterFuncParams: {field: 'unr'}, visible: false},
-					{title: this.$p.t('lehre', 'fachbereich'), field: "fachbereich", headerFilter: true, headerFilterFuncParams: {field: 'fachbereich'}, visible: false},
+					{title: this.$p.t('lehre', 'organisationseinheit'), field: "fachbereich", headerFilter: true, headerFilterFuncParams: {field: 'fachbereich'}, visible: false},
 					{title: this.$p.t('lehre', 'stundenblockung'), field: "stundenblockung", headerFilter: true, headerFilterFuncParams: {field: 'stundenblockung'}, visible: false},
 					{title: this.$p.t('lehre', 'wochenrhythmus'), field: "wochenrythmus", headerFilter: true, headerFilterFuncParams: {field: 'wochenrythmus'}, visible: false},
 					{title: this.$p.t('lehre', 'startkw'), field: "start_kw", headerFilter: true, headerFilterFuncParams: {field: 'startkw'}, visible: false},
@@ -596,11 +596,21 @@ export default {
 		},
 		deleteLehreinheit(row)
 		{
-			let deleteData = {
-				lehreinheit_id: row.getData().lehreinheit_id,
-			}
+			let lehreinheit_id = row.getData().lehreinheit_id;
+
+			let is_selected = this.selectedColumnValues.length > 0 && this.selectedColumnValues.includes(lehreinheit_id);
+
+			let deleteData = is_selected ? {lehreinheit_id: [...new Set(this.selectedColumnValues)]} : {lehreinheit_id: lehreinheit_id};
+
 			return this.$api.call(ApiLehreinheit.delete(deleteData))
 				.then(result => {
+
+					if (result?.data?.errors)
+					{
+						result.data.errors.forEach(error  => {
+							this.$fhcAlert.alertError(error)
+						})
+					}
 					this.reload()
 				})
 				.catch(this.$fhcAlert.handleSystemError);

From 0a53ca49aa9211cdb1c2d523000fd36122dc390c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Nov 2025 09:39:46 +0100
Subject: [PATCH 094/101] readd accoutinfoblatt to single student dropdown

---
 application/controllers/api/frontend/v1/stv/Dokumente.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 27ccccac5..4f33405ae 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -589,7 +589,7 @@ class Dokumente extends FHCAPI_Controller
 		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
 
 		$documents = [
-
+			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null),
 			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uid, 20, null),
 			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Zweisprachig", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uid, 21, null),
 

From dbfa64a4367bf6f954487c19834d5e76fa27b7a5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Nov 2025 10:46:27 +0100
Subject: [PATCH 095/101] do not use cisroot for document download

---
 .../Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
index 1136d6f98..e5425dd2a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/DocumentDropdown.js
@@ -33,7 +33,7 @@ export default {
 	methods: {
 		printDokument(url, scope){
 			//TODO Manu(check if logic not in content (Zutrittkarte also in content folder))
-			let linkToPdf = this.cisRoot + 'content/' + url;
+			let linkToPdf = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'content/' + url;
 			window.open(linkToPdf, '_blank');
 		}
 	},

From 1c319addc5fc42fcd8734015e638ca782b75ebe2 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Nov 2025 11:03:48 +0100
Subject: [PATCH 096/101] do not use cisroot for document download

---
 .../Details/Abschlusspruefung/AbschlusspruefungDropdown.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/AbschlusspruefungDropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/AbschlusspruefungDropdown.js
index d637b125f..f7452c7c0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/AbschlusspruefungDropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/AbschlusspruefungDropdown.js
@@ -102,9 +102,9 @@ export default {
 			uids = !Array.isArray(this.studentUids) ? this.studentUids : this.studentUids.join(";");
 
 			let linkToPdf = this.showDropDownMulti
-				? this.cisRoot +
+				? FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				'content/pdfExport.php?xml=abschlusspruefung.rdf.php&xsl=' + xsl + '&uid=' + uids + '&xsl_stg_kz=' + this.stgKz + '&output=' + output
-				: this.cisRoot +
+				: FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				'content/pdfExport.php?xml=abschlusspruefung.rdf.php&xsl=' + xsl + '&abschlusspruefung_id=' +  this.abschlusspruefung_id + '&uid=' + uids + '&xsl_stg_kz=' + this.stgKz + '&output=' + output;
 
 			this.$emit('linkGenerated', linkToPdf);

From f281925874ea935ef2bd2c5109b8ebdba2530ffe Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Nov 2025 11:13:23 +0100
Subject: [PATCH 097/101] do not use cisroot for link to final exam protocol

---
 .../Details/Abschlusspruefung/Abschlusspruefung.js             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index d93116ffc..6e862fc01 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -379,8 +379,7 @@ export default {
 				.call(ApiStvAbschlusspruefung.loadAbschlusspruefung(abschlusspruefung_id))
 				.then(result => {
 					this.formData = result.data;
-					//TODO(Manu) check if cisRoot is okay
-					this.formData.link = this.cisRoot + 'index.ci.php/lehre/Pruefungsprotokoll/showProtokoll?abschlusspruefung_id=' + this.formData.abschlusspruefung_id + '&fhc_controller_id=67481e5ed5490';
+					this.formData.link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/lehre/Pruefungsprotokoll/showProtokoll?abschlusspruefung_id=' + this.formData.abschlusspruefung_id;
 					return result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);

From c9506adc10bdce301ec77103b9031b296452cdec Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Nov 2025 11:19:54 +0100
Subject: [PATCH 098/101] do not use cisroot for link to placement test
 administration

---
 .../Details/Aufnahmetermine/Aufnahmetermine.js                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 955ca1a9d..266c6774e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -322,7 +322,7 @@ export default {
 				this.$refs.filterButton.title = this.$p.t('admission', 'loadZukuenftigeRT');}
 		},
 		openAdministrationPlacementTest(reihungstest_id){
-			let link = this.cisRoot + 'vilesci/stammdaten/reihungstestverwaltung.php';
+			let link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'vilesci/stammdaten/reihungstestverwaltung.php';
 			if(reihungstest_id){
 				link += '?reihungstest_id=' + reihungstest_id;
 			}

From 53424999dc3dd5cb48d939e82b5188d36a0800b4 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Tue, 18 Nov 2025 10:57:46 +0100
Subject: [PATCH 099/101] Created Vue Tooltip directive

This directive initializes and disposes Bootstrap tooltip
---
 public/js/directives/tooltip.js | 62 +++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 public/js/directives/tooltip.js

diff --git a/public/js/directives/tooltip.js b/public/js/directives/tooltip.js
new file mode 100644
index 000000000..dabe75b3a
--- /dev/null
+++ b/public/js/directives/tooltip.js
@@ -0,0 +1,62 @@
+/**
+ * v-tooltip - This directive makes it easy to initialize Bootstrap tooltips in Vue.
+ *
+ * Features:
+ * - Automatically initializes a Bootstrap tooltip on mount.
+ * - Re-initializes only when the bound value changes.
+ * - Cleans up the tooltip on unmount.
+
+ * Usage examples:
+ *
+ * 1) Shortest way:
+ *    <span v-tooltip title="Static tooltip">
+ *        Hover me!
+ *    </span>
+ *
+ * 2) With binding value. New value will trigger update features (destroy old + create new tooltip creation)
+ *    <span v-tooltip="userInfo" :title="userInfo">
+ *        Hover me!
+ *    </span>
+ *
+ * 3) Allowing HTML inside tooltip:
+ *    <span v-tooltip title="<b>Bold text</b>" data-bs-html="true">
+ *        Hover me!
+ *    </span>
+ *
+ */
+export default {
+	mounted(el, binding) {
+		const opts = {
+			title: binding.value ?? el.getAttribute('title'), // fallback if no binding
+			html: el.getAttribute('data-bs-html') === 'true',
+			customClass: el.getAttribute('data-bs-custom-class') || ''
+		};
+
+		// Create tooltip
+		el._tooltip = new bootstrap.Tooltip(el, opts);
+	},
+	updated(el, binding) {
+		// Only dispose and create new Tooltip if value (the title-string) has changed
+		if (binding.value !== binding.oldValue){
+
+			if (el._tooltip) {
+				el._tooltip.dispose();
+			}
+
+			const opts = {
+				title: binding.value ?? el.getAttribute('title'), // fallback if no binding
+				html: el.getAttribute('data-bs-html') === 'true',
+				customClass: el.getAttribute('data-bs-custom-class') || ''
+			};
+
+			el._tooltip = new bootstrap.Tooltip(el, opts);
+		}
+	},
+	unmounted(el) {
+		// Cleanup
+		if (el._tooltip) {
+			el._tooltip.dispose();
+			delete el._tooltip;
+		}
+	}
+}

From e4a79552395847da36aa027081c11041d8eb0988 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 18 Nov 2025 16:42:31 +0100
Subject: [PATCH 100/101] fix editor params stored empty in tabulator local
 storage causing empty grade dropdown when switching tabs

---
 .../Stv/Studentenverwaltung/Details/Noten/Zeugnis.js       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index ce912c240..d3ca1a25e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -219,7 +219,10 @@ export default {
 				height: '100%',
 				selectable: 1,
 				selectableRangeMode: 'click',
-				persistenceID: 'stv-details-noten-zeugnis'
+				persistenceID: 'stv-details-noten-zeugnis-2025111801',
+				persistence:{
+					columns: ["width", "visible", "frozen"]
+				}
 			};
 		}
 	},
@@ -287,4 +290,4 @@ export default {
 			<zeugnis-documents :data="grade" :list="config.documentslist"></zeugnis-documents>
 		</Teleport>
 	</div>`
-};
\ No newline at end of file
+};

From 060f11f1d8bf9839a7bf89454b51ce586a1dc932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 24 Nov 2025 09:49:15 +0100
Subject: [PATCH 101/101] Anmerkung und Spaltenanzahl bei Leistungsstipendien
 Import angepasst

---
 vilesci/personen/leistungsstipendium.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vilesci/personen/leistungsstipendium.php b/vilesci/personen/leistungsstipendium.php
index 45732c902..f70dc2da6 100644
--- a/vilesci/personen/leistungsstipendium.php
+++ b/vilesci/personen/leistungsstipendium.php
@@ -71,7 +71,7 @@ $fileTmpName = null;
 $fileMimeType = null;
 
 // Constants
-$L_CSV_N_COLS = 10; // Number of columns of the CSV file
+$L_CSV_N_COLS = 9; // Number of columns of the CSV file
 $L_ERROR = "Error";
 $L_WARNING = "Warning";
 $L_INFO = "Info";
@@ -477,8 +477,8 @@ if (!$errorOccurred && $dataPosted)
 						Feldtrenner: ;<br>
 						Texttrenner: "<br>
 						Felder:<br>
-						<pre>Nachname;Vorname;UID/PersKZ;Studiengang;Betrag;Überweisungsdatum
-Dylan;Bob;1234567;MEE;750;03.10.2016</pre>
+						<pre>Nachname;Vorname;Gebdatum;UID/PersKZ;Studiengang;Betrag;IBAN;BIC;Bankname
+Dylan;Bob;12.12.2000;1234567;MEE;750;ATXXXX;BBAWAATWW;BAWAG PSK</pre>
 					</td>
 				</tr>
 				<tr>