From 6e9ee7cf814f7d8cba1e95b481abc6dbf7c9af89 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 3 May 2024 09:43:49 +0200
Subject: [PATCH 01/37] Notizcomponent: Api Controller for Notizzuordnungs_ids

---
 .../api/frontend/v1/notiz/Notiz.php           | 384 ------------------
 .../api/frontend/v1/notiz/NotizAnrechnung.php |  44 ++
 .../api/frontend/v1/notiz/NotizBestellung.php |  43 ++
 .../frontend/v1/notiz/NotizLehreinheit.php    |  44 ++
 .../frontend/v1/notiz/NotizMitarbeiter.php    |  44 ++
 .../api/frontend/v1/notiz/NotizPerson.php     |  33 ++
 .../api/frontend/v1/notiz/NotizPrestudent.php |  44 ++
 .../api/frontend/v1/notiz/NotizProjekt.php    |  32 ++
 .../frontend/v1/notiz/NotizProjektphase.php   |  32 ++
 .../frontend/v1/notiz/NotizProjekttask.php    |  32 ++
 application/core/Notiz_Controller.php         |  79 ++--
 public/js/api/notiz.js                        |  22 +-
 public/js/api/notiz/anrechnung.js             |  38 ++
 public/js/api/notiz/bestellung.js             |  38 ++
 public/js/api/notiz/lehreinheit.js            |  38 ++
 public/js/api/notiz/mitarbeiter.js            |  38 ++
 public/js/api/notiz/person.js                 |  19 +-
 public/js/api/notiz/prestudent.js             |  38 ++
 public/js/api/notiz/projekt.js                |  38 ++
 public/js/api/notiz/projektphase.js           |  38 ++
 public/js/api/notiz/projekttask.js            |  38 ++
 .../Studentenverwaltung/Details/Notizen.js    |  72 ++--
 system/phrasesupdate.php                      |  22 +
 23 files changed, 786 insertions(+), 464 deletions(-)
 delete mode 100644 application/controllers/api/frontend/v1/notiz/Notiz.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizBestellung.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizPerson.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizPrestudent.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizProjekt.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizProjektphase.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizProjekttask.php
 create mode 100644 public/js/api/notiz/anrechnung.js
 create mode 100644 public/js/api/notiz/bestellung.js
 create mode 100644 public/js/api/notiz/lehreinheit.js
 create mode 100644 public/js/api/notiz/mitarbeiter.js
 create mode 100644 public/js/api/notiz/prestudent.js
 create mode 100644 public/js/api/notiz/projekt.js
 create mode 100644 public/js/api/notiz/projektphase.js
 create mode 100644 public/js/api/notiz/projekttask.js

diff --git a/application/controllers/api/frontend/v1/notiz/Notiz.php b/application/controllers/api/frontend/v1/notiz/Notiz.php
deleted file mode 100644
index 2288766c4..000000000
--- a/application/controllers/api/frontend/v1/notiz/Notiz.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Notiz extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getUid' => ['admin:r', 'assistenz:r'],
-			'getNotizen' => ['admin:r', 'assistenz:r'],
-			'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'deleteNotiz' => ['admin:r', 'assistenz:r'],
-			'loadDokumente' => ['admin:r', 'assistenz:r'],
-			'getMitarbeiter' => ['admin:r', 'assistenz:r']
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	/*	public function getUid()
-		{
-			$this->terminateWithSuccess(getAuthUID());
-		}*/
-
-
-	public function getNotizen($id, $type)
-	{
-
-		//check if valid type
-		$result = $this->NotizzuordnungModel->isValidType($type);
-		if(isError($result))
-			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
-
-		//$this->terminateWithError(" after check type not valid", self::ERROR_TYPE_GENERAL);
-		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
-
-		//	return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
-
-	}
-
-	/*	public function loadNotiz()
-		{
-			$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-			$notiz_id = $this->input->post('notiz_id');
-
-			//$this->load->model('person/Notiz_model', 'NotizModel');
-			$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
-			$this->NotizModel->addSelect('*');
-			$this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum
-				THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
-			$this->NotizModel->addLimit(1);
-
-			$result = $this->NotizModel->loadWhere(
-				array('notiz_id' => $notiz_id)
-			);
-			if (isError($result))
-			{
-				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			elseif (!hasData($result))
-			{
-				$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
-			}
-			else
-			{
-				$this->terminateWithSuccess(current(getData($result)));
-			}
-		}
-
-
-		public function updateNotiz()
-		{
-			$this->load->library('form_validation');
-			$this->load->library('DmsLib');
-
-			if (isset($_POST['data']))
-			{
-				$data = json_decode($_POST['data']);
-				unset($_POST['data']);
-				foreach ($data as $k => $v) {
-					$_POST[$k] = $v;
-				}
-			}
-
-			$notiz_id = $this->input->post('notiz_id');
-
-			if(!$notiz_id)
-			{
-				$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//Form Validation
-			$this->form_validation->set_rules('titel', 'Titel', 'required', [
-				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
-			]);
-
-			$this->form_validation->set_rules('text', 'Text', 'required', [
-				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
-			]);
-
-			if ($this->form_validation->run() == false)
-			{
-				$this->terminateWithValidationErrors($this->form_validation->error_array());
-			}
-
-			//update Notiz
-			$uid = getAuthUID();
-			$titel = $this->input->post('titel');
-			$text = $this->input->post('text');
-			$verfasser_uid = $this->input->post('verfasser');
-			$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
-			$erledigt = $this->input->post('erledigt');
-			$start = $this->input->post('start');
-			$ende = $this->input->post('ende');
-
-			$result = $this->NotizModel->update(
-				[
-					'notiz_id' => $notiz_id
-				],
-				[
-					'titel' =>  $titel,
-					'updatevon' => $uid,
-					'updateamum' => date('c'),
-					'text' => $text,
-					'verfasser_uid' => $verfasser_uid,
-					'bearbeiter_uid' => $bearbeiter_uid,
-					'start' => $start,
-					'ende' => $ende,
-					'erledigt' => $erledigt
-				]
-			);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-
-			//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
-			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-			$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
-			$dms_uploaded = null;
-
-			$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
-			if (isError($result))
-			{
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			elseif (!hasData($result))
-			{
-				$dms_id_arr = null;
-			}
-			else
-			{
-				$result = getData($result);
-				foreach($result as $doc) {
-					$dms_id_arr[] = array(
-						'name' => $doc->name,
-						'dms_id' => $doc->dms_id
-					);
-				}
-			}
-
-			foreach ($_FILES as $k => $file)
-			{
-				//update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
-				if($file["type"] == 'application/x.fhc-dms+json')
-				{
-					$dms_uploaded[] = array(
-						'name' => $file["name"]
-					);
-				}
-				else
-				{
-					$dms = array(
-						'kategorie_kurzbz'  => 'notiz',
-						'version'           => 0,
-						'name'              => $file["name"],
-						'mimetype'          => $file["type"],
-						'insertamum'        => date('c'),
-						'insertvon'         => $uid
-					);
-
-					//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
-					//Todo(manu)check name files: nicht gleiches file 2mal hochladen
-					$result = $this->dmslib->upload($dms, $k, array('*'));
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					$dms_id = $result->retval['dms_id'];
-
-					$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-				}
-			}
-
-			//update(3) check if Dateien gelöscht wurden
-			if(count($dms_uploaded) != count($dms_id_arr))
-			{
-				if (count($dms_uploaded) == 0)
-				{
-					$filesDeleted = $dms_id_arr;
-				}
-				else
-				{
-					$upload_new_names = array_column($dms_uploaded, "name");
-
-					$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
-						return !in_array($file["name"], $upload_new_names);
-					});
-				}
-
-				foreach ($filesDeleted as $file)
-				{
-					$result = $this->dmslib->removeAll($file['dms_id']);
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->outputJson($result);
-				}
-			}
-			return $this->terminateWithSuccess($result);
-		}*/
-
-
-	/*	public function deleteNotiz()
-		{
-			$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-			$notiz_id = $this->input->post('notiz_id');
-			$type = $this->input->post('type_id');
-			$id = $this->input->post('id');
-
-			//dms_id auslesen aus notizdokument wenn vorhanden
-			$dms_id_arr = [];
-			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-
-			$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
-
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(hasData($result))
-			{
-				$result = getData($result);
-				foreach ($result as $doc) {
-					$dms_id_arr[] = $doc->dms_id;
-				}
-			}
-
-			if($dms_id_arr)
-			{
-				$this->load->library('DmsLib');
-				foreach($dms_id_arr as $dms_id)
-				{
-					$result = $this->dmslib->removeAll($dms_id);
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-
-					$this->outputJson($result);
-				}
-			}
-
-			//delete Notizzuordnung
-			if($type == "software_id")
-			{
-				// Loads extension Model
-				$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
-				$result = $this->ExtensionnotizzuordnungModel->delete([
-					'notiz_id' => $notiz_id,
-					'id' => strval($id)
-					],
-					[
-					'type_id' => $type
-				]);
-
-			}
-			else
-			{
-				//notizzuordnungsid!
-				$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
-			}
-
-
-			$this->load->model('person/Notiz_model', 'NotizModel');
-			//$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
-
-			//TODO (erweitern um Type_id) für Extensions, damit auch Notizzuordnung gelöscht werden kann
-
-			//Löschen von Notiz
-			$result = $this->NotizModel->delete(
-				array('notiz_id' => $notiz_id)
-			);
-
-			if (isError($result))
-			{
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			if(!hasData($result))
-			{
-				return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
-			}
-
-			return $this->terminateWithSuccess(current(getData($result)));
-		}*/
-
-	/*	public function loadDokumente()
-		{
-			$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-			$notiz_id = $this->input->post('notiz_id');
-
-			$this->NotizModel->addSelect('campus.tbl_dms_version.*');
-
-			$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
-			$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
-
-			$result = $this->NotizModel->loadWhere(
-				array('public.tbl_notiz.notiz_id' => $notiz_id)
-			);
-			if (isError($result)) {
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!hasData($result))
-			{
-				return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
-			}
-			return $this->terminateWithSuccess(getData($result));
-		}*/
-
-	/*	public function getMitarbeiter($searchString)
-		{
-			$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-			$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
-			if (isError($result)) {
-				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			return $this->terminateWithSuccess($result);
-		}*/
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		return success("berechtigt in überschreibender Funktion");
-		/*		return $this->terminateWithError('keine Berechtigung bro', self::ERROR_TYPE_GENERAL);*/
-	}
-
-}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php b/application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php
new file mode 100644
index 000000000..b58020507
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php
@@ -0,0 +1,44 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizAnrechnung extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "anrechnung_id")
+		{
+			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//TODO define permission
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizBestellung.php b/application/controllers/api/frontend/v1/notiz/NotizBestellung.php
new file mode 100644
index 000000000..483efd619
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizBestellung.php
@@ -0,0 +1,43 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizBestellung extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "bestellung_id")
+		{
+			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+		//TODO define permission
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php b/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
new file mode 100644
index 000000000..5c40af368
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
@@ -0,0 +1,44 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizLehreinheit extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "lehreinheit_id")
+		{
+			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//TODO define permission
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php b/application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php
new file mode 100644
index 000000000..fd8ee3bbb
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php
@@ -0,0 +1,44 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizMitarbeiter extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "mitarbeiter_uid")
+		{
+			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//TODO define permission
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
new file mode 100644
index 000000000..2cf1f2519
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -0,0 +1,33 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizPerson extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "person_id")
+		{
+			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//TODO define permission
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		return $this->outputJsonSuccess(true);
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php b/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php
new file mode 100644
index 000000000..d4f50e69c
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php
@@ -0,0 +1,44 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizPrestudent extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "prestudent_id")
+		{
+			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//TODO define permission
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizProjekt.php b/application/controllers/api/frontend/v1/notiz/NotizProjekt.php
new file mode 100644
index 000000000..180f58b1b
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizProjekt.php
@@ -0,0 +1,32 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizProjekt extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "projekt_kurzbz")
+		{
+			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//TODO define permission
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizProjektphase.php b/application/controllers/api/frontend/v1/notiz/NotizProjektphase.php
new file mode 100644
index 000000000..071aae6a5
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizProjektphase.php
@@ -0,0 +1,32 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizProjektphase extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "projektphase_id")
+		{
+			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//TODO define permission
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizProjekttask.php b/application/controllers/api/frontend/v1/notiz/NotizProjekttask.php
new file mode 100644
index 000000000..4d407051a
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizProjekttask.php
@@ -0,0 +1,32 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizProjekttask extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "projekttask_id")
+		{
+			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//TODO define permission
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+	}
+}
\ No newline at end of file
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 51d6854b7..8a93c4f0f 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -10,19 +10,20 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getUid' => ['admin:r', 'assistenz:r'],
-			'getNotizen' => ['admin:r', 'assistenz:r'],
-			'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'deleteNotiz' => ['admin:r', 'assistenz:r'],
-			'loadDokumente' => ['admin:r', 'assistenz:r'],
-			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
-			'isBerechtigt' => ['admin:r', 'assistenz:r']
+			'getUid' => self::PERM_LOGGED,
+			'getNotizen' => self::PERM_LOGGED,
+			'loadNotiz' => self::PERM_LOGGED,
+			'addNewNotiz' => self::PERM_LOGGED,
+			'updateNotiz' => self::PERM_LOGGED,
+			'deleteNotiz' => ['admin:w', 'assistenz:w'],
+			'loadDokumente' => ['admin:w', 'assistenz:w'],
+			'getMitarbeiter' => self::PERM_LOGGED,
+			'isBerechtigt' => self::PERM_LOGGED,
 		]);
 
 		//Load Models
 		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -39,7 +40,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 	}
 
 
-	//Standardfall: für extensions überschreiben: speichern der Zuordnung in eigene Extensiontabelle angeben
+	//Override function for extensions
 	protected function assignNotiz($notiz_id, $id, $type)
 	{
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -55,7 +56,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		return success(getData($result));
 	}
 
-	//Standardfall: für extensions überschreiben: speichern der Zuordnung in eigene Extensiontabelle angeben
+	//Override function for extensions
 	protected function deleteNotizzuordnung($notiz_id, $id, $type)
 	{
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -72,11 +73,23 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 	}
 
 
+	//Override function for extensions
+	public function getNotizen($id, $type)
+	{
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if(isError($result))
+			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
 
-	//TODO(manu) abstract
-	protected function getNotizen($id, $type) {}
+		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
 
-	//TODO(manu) to abstract
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+
+	//Override function
 	protected function isBerechtigt($id, $typeId){
 		return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
 	}
@@ -144,7 +157,8 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
 		$erledigt = $this->input->post('erledigt');
-		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		//$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
 		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
 		$type = $this->input->post('typeId');
 		$start = $this->input->post('start');
@@ -153,7 +167,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		// Start DB transaction
 		$this->db->trans_start();
 
-		//Speichern der Notiz
+		//Save note
 		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
 			"insertvon" => $verfasser_uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
 
@@ -165,7 +179,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$notiz_id = $result->retval;
 
-		//Speichern der Notizzuordnung
+		//save Notizzuordnung
 		$result = $this->assignNotiz($notiz_id, $id, $type);
 
 		if (isError($result))
@@ -174,7 +188,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
-		//Speichern der Dokumente
+		//save Documents
 		$dms_id_arr = [];
 		foreach ($_FILES as $k => $file)
 		{
@@ -189,6 +203,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 			//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
 			//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+			//Todo define in dms component: readFile, downloadFile
 			$result = $this->dmslib->upload($dms, $k, ['*']);
 			/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
 			if (isError($result))
@@ -199,10 +214,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$dms_id_arr[] = $result->retval['dms_id'];
 		}
 
-		//Eintrag in Notizdokument speichern
+		//save entry in Notizdokument
 		if($dms_id_arr)
 		{
-			// Loads model Notizdokument_model
 			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 			foreach($dms_id_arr as $dms_id)
 			{
@@ -257,8 +271,8 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$uid = getAuthUID();
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
-		$verfasser_uid = $this->input->post('verfasser_uid');
-		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : $uid;
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
 		$erledigt = $this->input->post('erledigt');
 		$start = $this->input->post('start');
 		$ende = $this->input->post('ende');
@@ -284,7 +298,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
-		//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
+		//update(1) loading all dms-entries with this notiz_id
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
 		$dms_uploaded = null;
@@ -311,7 +325,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		foreach ($_FILES as $k => $file)
 		{
-			//update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
+			//update(2) attach all new files (except type application/x.fhc-dms+json)
 			if($file["type"] == 'application/x.fhc-dms+json')
 			{
 				$dms_uploaded[] = array(
@@ -331,6 +345,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
 				//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+				//Todo define in dms component: readFile, downloadFile
 				$result = $this->dmslib->upload($dms, $k, array('*'));
 
 				if (isError($result))
@@ -347,7 +362,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			}
 		}
 
-		//update(3) check if Dateien gelöscht wurden
+		//update(3) check if all files have been deleted
 		if(count($dms_uploaded) != count($dms_id_arr))
 		{
 			if (count($dms_uploaded) == 0)
@@ -387,12 +402,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$typeId = $this->input->post('type_id');
 		$id = $this->input->post('id');
 
-		if(!$this->isBerechtigt($id, $typeId))
-		{
-			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), self::ERROR_TYPE_GENERAL);
-		}
+		//TODO(manu): define Permissions for deletion document if filecomponent finished
 
-		//dms_id auslesen aus notizdokument wenn vorhanden
+		//get dms_id from notizdokument
 		$dms_id_arr = [];
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 
@@ -416,7 +428,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			// Start DB transaction
 			$this->db->trans_start();
 
-			//return $this->terminateWithError("dms_id kommt: " . $notiz_id, self::ERROR_TYPE_GENERAL);
 			$this->load->library('DmsLib');
 
 
@@ -444,7 +455,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
-		//Löschen von Notiz
+		//Delete Note
 		$result = $this->NotizModel->delete(
 			array('notiz_id' => $notiz_id)
 		);
@@ -465,10 +476,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 	public function loadDokumente()
 	{
-		if(!$this->isBerechtigt('$id', '$typeId'))
-		{
-			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), self::ERROR_TYPE_GENERAL);
-		}
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$notiz_id = $this->input->post('notiz_id');
 
diff --git a/public/js/api/notiz.js b/public/js/api/notiz.js
index 9d210a8f9..b0a01e989 100644
--- a/public/js/api/notiz.js
+++ b/public/js/api/notiz.js
@@ -1,13 +1,29 @@
-//TODO(Manu) refactor with require or async
+//TODO(Manu) refactor for extensions with require or async
 //sonst Error wenn extension file nicht vorhanden
 
 import person from "./notiz/person.js";
-import softwarenotiz from "../../extensions/FHC-Core-Softwarebereitstellung/js/api/softwarenotiz.js";
+import prestudent from "./notiz/prestudent.js";
+import mitarbeiter from "./notiz/mitarbeiter.js";
+import projekt from "./notiz/projekt.js";
+import anrechnung from "./notiz/anrechnung.js";
+import bestellung from "./notiz/bestellung.js";
+import lehreinheit from "./notiz/lehreinheit.js";
+import projektphase from "./notiz/projektphase.js";
+import projekttask from "./notiz/projekttask.js";
+//import softwarenotiz from "../../extensions/FHC-Core-Softwarebereitstellung/js/api/softwarenotiz.js";
 //import pppnotiz from "../../extensions/FHC-Core-PEP/js/api/pppnotiz.js";
 
 
 export default {
 	person,
-	softwarenotiz,
+	prestudent,
+	mitarbeiter,
+	anrechnung,
+	bestellung,
+	lehreinheit,
+	projekt,
+	projektphase,
+	projekttask,
+//	softwarenotiz,
 //	pppnotiz
 }
\ No newline at end of file
diff --git a/public/js/api/notiz/anrechnung.js b/public/js/api/notiz/anrechnung.js
new file mode 100644
index 000000000..843017687
--- /dev/null
+++ b/public/js/api/notiz/anrechnung.js
@@ -0,0 +1,38 @@
+export default {
+	getNotizen(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizAnrechnung/getNotizen/' + params.id + '/' + params.type);
+	},
+	getUid(){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizAnrechnung/getUid/');
+	},
+	addNewNotiz(id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/addNewNotiz/' + id,
+			formData
+		);
+	},
+	loadNotiz(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/loadNotiz/', {
+			notiz_id
+		});
+	},
+	loadDokumente(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/loadDokumente/', {
+			notiz_id
+		});
+	},
+	deleteNotiz(notiz_id, type_id, id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/deleteNotiz/', {
+			notiz_id,
+			type_id,
+			id
+		});
+	},
+	updateNotiz(notiz_id, formData){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/updateNotiz/' + notiz_id,
+			formData
+		);
+	},
+	getMitarbeiter(event){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizAnrechnung/getMitarbeiter/' + event);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/notiz/bestellung.js b/public/js/api/notiz/bestellung.js
new file mode 100644
index 000000000..3f0f5268c
--- /dev/null
+++ b/public/js/api/notiz/bestellung.js
@@ -0,0 +1,38 @@
+export default {
+	getNotizen(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizBestellung/getNotizen/' + params.id + '/' + params.type);
+	},
+	getUid(){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizBestellung/getUid/');
+	},
+	addNewNotiz(id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/addNewNotiz/' + id,
+			formData
+		);
+	},
+	loadNotiz(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/loadNotiz/', {
+			notiz_id
+		});
+	},
+	loadDokumente(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/loadDokumente/', {
+			notiz_id
+		});
+	},
+	deleteNotiz(notiz_id, type_id, id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/deleteNotiz/', {
+			notiz_id,
+			type_id,
+			id
+		});
+	},
+	updateNotiz(notiz_id, formData){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/updateNotiz/' + notiz_id,
+			formData
+		);
+	},
+	getMitarbeiter(event){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizBestellung/getMitarbeiter/' + event);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/notiz/lehreinheit.js b/public/js/api/notiz/lehreinheit.js
new file mode 100644
index 000000000..85b3187ae
--- /dev/null
+++ b/public/js/api/notiz/lehreinheit.js
@@ -0,0 +1,38 @@
+export default {
+	getNotizen(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizLehreinheit/getNotizen/' + params.id + '/' + params.type);
+	},
+	getUid(){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizLehreinheit/getUid/');
+	},
+	addNewNotiz(id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/addNewNotiz/' + id,
+			formData
+		);
+	},
+	loadNotiz(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/loadNotiz/', {
+			notiz_id
+		});
+	},
+	loadDokumente(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/loadDokumente/', {
+			notiz_id
+		});
+	},
+	deleteNotiz(notiz_id, type_id, id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/deleteNotiz/', {
+			notiz_id,
+			type_id,
+			id
+		});
+	},
+	updateNotiz(notiz_id, formData){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/updateNotiz/' + notiz_id,
+			formData
+		);
+	},
+	getMitarbeiter(event){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizLehreinheit/getMitarbeiter/' + event);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/notiz/mitarbeiter.js b/public/js/api/notiz/mitarbeiter.js
new file mode 100644
index 000000000..ada9b0ae8
--- /dev/null
+++ b/public/js/api/notiz/mitarbeiter.js
@@ -0,0 +1,38 @@
+export default {
+	getNotizen(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizMitarbeiter/getNotizen/' + params.id + '/' + params.type);
+	},
+	getUid(){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizMitarbeiter/getUid/');
+	},
+	addNewNotiz(id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/addNewNotiz/' + id,
+			formData
+		);
+	},
+	loadNotiz(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/loadNotiz/', {
+			notiz_id
+		});
+	},
+	loadDokumente(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/loadDokumente/', {
+			notiz_id
+		});
+	},
+	deleteNotiz(notiz_id, type_id, id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/deleteNotiz/', {
+			notiz_id,
+			type_id,
+			id
+		});
+	},
+	updateNotiz(notiz_id, formData){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/updateNotiz/' + notiz_id,
+			formData
+		);
+	},
+	getMitarbeiter(event){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizMitarbeiter/getMitarbeiter/' + event);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/notiz/person.js b/public/js/api/notiz/person.js
index be19b4ed9..62a3640f0 100644
--- a/public/js/api/notiz/person.js
+++ b/public/js/api/notiz/person.js
@@ -1,38 +1,41 @@
 export default {
 	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getNotizen/' + params.id + '/' + params.type);
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/getNotizen/' + params.id + '/' + params.type);
 	},
 	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getUid/');
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/getUid/');
 	},
 	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/addNewNotiz/' + id,
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/addNewNotiz/' + id,
 			formData
 		);
 	},
 	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/loadNotiz/', {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/loadNotiz/', {
 			notiz_id
 		});
 	},
 	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/loadDokumente/', {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/loadDokumente/', {
 			notiz_id
 		});
 	},
 	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/deleteNotiz/', {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/deleteNotiz/', {
 			notiz_id,
 			type_id,
 			id
 		});
 	},
 	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/updateNotiz/' + notiz_id,
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/updateNotiz/' + notiz_id,
 			formData
 		);
 	},
 	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getMitarbeiter/' + event);
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/getMitarbeiter/' + event);
+	},
+	isBerechtigt(id, type_id){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/isBerechtigt/');
 	}
 }
\ No newline at end of file
diff --git a/public/js/api/notiz/prestudent.js b/public/js/api/notiz/prestudent.js
new file mode 100644
index 000000000..c529ea44e
--- /dev/null
+++ b/public/js/api/notiz/prestudent.js
@@ -0,0 +1,38 @@
+export default {
+	getNotizen(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPrestudent/getNotizen/' + params.id + '/' + params.type);
+	},
+	getUid(){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPrestudent/getUid/');
+	},
+	addNewNotiz(id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/addNewNotiz/' + id,
+			formData
+		);
+	},
+	loadNotiz(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/loadNotiz/', {
+			notiz_id
+		});
+	},
+	loadDokumente(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/loadDokumente/', {
+			notiz_id
+		});
+	},
+	deleteNotiz(notiz_id, type_id, id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/deleteNotiz/', {
+			notiz_id,
+			type_id,
+			id
+		});
+	},
+	updateNotiz(notiz_id, formData){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/updateNotiz/' + notiz_id,
+			formData
+		);
+	},
+	getMitarbeiter(event){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPrestudent/getMitarbeiter/' + event);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/notiz/projekt.js b/public/js/api/notiz/projekt.js
new file mode 100644
index 000000000..ac8b71623
--- /dev/null
+++ b/public/js/api/notiz/projekt.js
@@ -0,0 +1,38 @@
+export default {
+	getNotizen(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/NotizProjekt/getNotizen/' + params.id + '/' + params.type);
+	},
+	getUid(){
+		return this.$fhcApi.get('api/frontend/v1/notiz/NotizProjekt/getUid/');
+	},
+	addNewNotiz(id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/addNewNotiz/' + id,
+			formData
+		);
+	},
+	loadNotiz(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/loadNotiz/', {
+			notiz_id
+		});
+	},
+	loadDokumente(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/loadDokumente/', {
+			notiz_id
+		});
+	},
+	deleteNotiz(notiz_id, type_id, id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/deleteNotiz/', {
+			notiz_id,
+			type_id,
+			id
+		});
+	},
+	updateNotiz(notiz_id, formData){
+		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/updateNotiz/' + notiz_id,
+			formData
+		);
+	},
+	getMitarbeiter(event){
+		return this.$fhcApi.get('api/frontend/v1/notiz/NotizProjekt/getMitarbeiter/' + event);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/notiz/projektphase.js b/public/js/api/notiz/projektphase.js
new file mode 100644
index 000000000..8b85106a3
--- /dev/null
+++ b/public/js/api/notiz/projektphase.js
@@ -0,0 +1,38 @@
+export default {
+	getNotizen(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjektphase/getNotizen/' + params.id + '/' + params.type);
+	},
+	getUid(){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjektphase/getUid/');
+	},
+	addNewNotiz(id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/addNewNotiz/' + id,
+			formData
+		);
+	},
+	loadNotiz(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/loadNotiz/', {
+			notiz_id
+		});
+	},
+	loadDokumente(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/loadDokumente/', {
+			notiz_id
+		});
+	},
+	deleteNotiz(notiz_id, type_id, id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/deleteNotiz/', {
+			notiz_id,
+			type_id,
+			id
+		});
+	},
+	updateNotiz(notiz_id, formData){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/updateNotiz/' + notiz_id,
+			formData
+		);
+	},
+	getMitarbeiter(event){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjektphase/getMitarbeiter/' + event);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/notiz/projekttask.js b/public/js/api/notiz/projekttask.js
new file mode 100644
index 000000000..6b6db3c77
--- /dev/null
+++ b/public/js/api/notiz/projekttask.js
@@ -0,0 +1,38 @@
+export default {
+	getNotizen(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjekttask/getNotizen/' + params.id + '/' + params.type);
+	},
+	getUid(){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjekttask/getUid/');
+	},
+	addNewNotiz(id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/addNewNotiz/' + id,
+			formData
+		);
+	},
+	loadNotiz(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/loadNotiz/', {
+			notiz_id
+		});
+	},
+	loadDokumente(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/loadDokumente/', {
+			notiz_id
+		});
+	},
+	deleteNotiz(notiz_id, type_id, id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/deleteNotiz/', {
+			notiz_id,
+			type_id,
+			id
+		});
+	},
+	updateNotiz(notiz_id, formData){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/updateNotiz/' + notiz_id,
+			formData
+		);
+	},
+	getMitarbeiter(event){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjekttask/getMitarbeiter/' + event);
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 4c128bfea..185b8d0d5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -11,20 +11,6 @@ export default {
 	<div class="stv-details-details h-100 pb-3">
 		<h3>Notizen</h3>
 		
-		<!--oldversion ohne factory-->
-<!--		<NotizComponent
-			endpoint="api/frontend/v1/stv/Notiz/"
-			ref="formc"
-			typeId="person_id"
-			:id="modelValue.person_id"
-			notizLayout="twoColumnsFormLeft"
-			:showErweitert="true"
-			:showDocument="true"
-			:showTinyMCE="false"
-			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
-			>
-		</NotizComponent>-->
-	
 <!--	mit factory als endpoint	-->
 		<NotizComponent
 			:endpoint="$fhcApi.factory.notiz.person"
@@ -32,18 +18,29 @@ export default {
 			typeId="person_id"
 			:id="modelValue.person_id"
 			notizLayout="twoColumnsFormLeft"
-			:showErweitert="true"
+			:showErweitert="false"
 			:showDocument="true"
-			:showTinyMCE="true"
+			:showTinyMCE="false"
 			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
 		</NotizComponent>
 		
+	
 <!--		
 ---------------------------------------------------------------------------------------------
 -------------------- DESCRIPTION FOR PARAMETER PROPS ----------------------------------------
 ---------------------------------------------------------------------------------------------
 
+endpoint: for corecontroller: eg: :endpoint="$fhcApi.factory.notiz.person"
+(...prestudent, ...mitarbeiter, ...bestellung, ...lehreinheit, ...projekt, ...projektphase, ...projekttask, ...anrechnung)
+
+for extensions: write own controller extending core NotizController
+
+ref="formc"
+
+typeId: id to which table the notizdata should be connected... eg. person_id, prestudent_id, uid (for mitarbeiter_uid), projekt_kurzbz, projektphase_id, projekttask_id,
+	bestellung_id, lehreinheit_id, anrechnung_id
+
 notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight"
 
 showErweitert: if true: section with following fields will be displayed:
@@ -53,12 +50,9 @@ showDocument: if true: section with documentHandling will be displayed
 
 showTinyMCE: if true: section with WYSIWYG Editor for Text will be displayed
 
-typeId: id to which table the notizdata should be connected... eg. person_id, prestudent_id, mitarbeiter_uid, projekt_kurzbz, projektphase_id, projekttask_id,
-	bestellung_id, lehreinheit_id, anrechnung_id, uid  
-	in progress for extensions
-
 visibleColumns: list, which fields shoult be showed as default in filter component
 		fullVersion: :visibleColumns="['titel','text','bearbeiter','verfasser','von','bis','dokumente','erledigt','notiz_id','notizzuordnung_id','id','lastupdate']"
+		
 
 ---------------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------------	
@@ -74,30 +68,42 @@ visibleColumns: list, which fields shoult be showed as default in filter compone
 ---------------------------------------------------------------------------------------------
 
 
-<br><br>
-		<h3>Test prestudentId</h3>
 		<NotizComponent
+			:endpoint="$fhcApi.factory.notiz.mitarbeiter"
 			ref="formc"
-			typeId="prestudent_id"
-			:id="modelValue.prestudent_id"
+			typeId="uid"
+			:id= "'ma0068'"
+			notizLayout="twoColumnsFormLeft"
+			:showErweitert="true"
+			:showDocument="true"
+			:showTinyMCE="false"
+			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
 		</NotizComponent>
 		
-		<br><br>
-		<h3>Test mitarbeiter_uid</h3>
 		<NotizComponent
+			:endpoint="$fhcApi.factory.notiz.prestudent"
 			ref="formc"
-			typeId="uid"
-			:id="'ma0068'"
+			typeId="prestudent_id"
+			:id="modelValue.prestudent_id"
+			notizLayout="twoColumnsFormLeft"
+			:showErweitert="true"
+			:showDocument="true"
+			:showTinyMCE="true"
+			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
-		</NotizComponent>-->
-		
-<!--		<br><br>
-		<h3>Test projekt</h3>
+		</NotizComponent>
+				
 		<NotizComponent
+			:endpoint="$fhcApi.factory.notiz.projekt"
 			ref="formc"
 			typeId="projekt_kurzbz"
-			:id="'Studentenausweis'"
+			:id="'EA74'" 
+			notizLayout="twoColumnsFormLeft"
+			:showErweitert="true"
+			:showDocument="true"
+			:showTinyMCE="true"
+			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
 		</NotizComponent>-->
 		
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ba4dcfa01..e4d6d1870 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27781,6 +27781,28 @@ array(
 			)
 		)
 	),
+
+	//****************************	 FHC-Core-Notizcomponent
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_typeNotizIdIncorrect',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Id-Typ der Notiz ist nicht korrekt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Id type of note is incorrect',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 4a8868a709b2f07c7ace3bb8772e9815fe55ad70 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:29:57 +0200
Subject: [PATCH 02/37] verfasser nur noch readonly - wird im backend gesetzt

---
 .../api/frontend/v1/notiz/NotizAnrechnung.php |   6 +-
 .../api/frontend/v1/notiz/NotizBestellung.php |   6 +-
 .../frontend/v1/notiz/NotizLehreinheit.php    |   6 +-
 .../frontend/v1/notiz/NotizMitarbeiter.php    |   6 +-
 .../api/frontend/v1/notiz/NotizPerson.php     |   6 +-
 .../api/frontend/v1/notiz/NotizPrestudent.php |   6 +-
 .../api/frontend/v1/notiz/NotizProjekt.php    |   6 +-
 .../frontend/v1/notiz/NotizProjektphase.php   |   6 +-
 .../frontend/v1/notiz/NotizProjekttask.php    |   6 +-
 application/core/Notiz_Controller.php         | 101 ++++++--------
 public/js/components/Notiz/Notiz.js           | 125 ++++++------------
 .../Studentenverwaltung/Details/Notizen.js    |   2 +-
 12 files changed, 114 insertions(+), 168 deletions(-)

diff --git a/application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php b/application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php
index b58020507..30dae9a50 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php
@@ -29,7 +29,7 @@ class NotizAnrechnung extends Notiz_Controller
 	{
 		if($typeId != "anrechnung_id")
 		{
-			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
 		//TODO define permission
@@ -37,8 +37,8 @@ class NotizAnrechnung extends Notiz_Controller
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizBestellung.php b/application/controllers/api/frontend/v1/notiz/NotizBestellung.php
index 483efd619..e30628f33 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizBestellung.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizBestellung.php
@@ -29,15 +29,15 @@ class NotizBestellung extends Notiz_Controller
 	{
 		if($typeId != "bestellung_id")
 		{
-			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 		//TODO define permission
 		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php b/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
index 5c40af368..a9c97532f 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
@@ -29,7 +29,7 @@ class NotizLehreinheit extends Notiz_Controller
 	{
 		if($typeId != "lehreinheit_id")
 		{
-			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
 		//TODO define permission
@@ -37,8 +37,8 @@ class NotizLehreinheit extends Notiz_Controller
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php b/application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php
index fd8ee3bbb..f7de4b47b 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php
@@ -29,7 +29,7 @@ class NotizMitarbeiter extends Notiz_Controller
 	{
 		if($typeId != "mitarbeiter_uid")
 		{
-			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
 		//TODO define permission
@@ -37,8 +37,8 @@ class NotizMitarbeiter extends Notiz_Controller
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index e67f953d6..80db4d8eb 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -25,17 +25,17 @@ class NotizPerson extends Notiz_Controller
 	{
 		if($typeId != "person_id")
 		{
-			return $this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
 		//TODO define permission
 		if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
 		{
 			$result =  $this->p->t('lehre', 'error_keineSchreibrechte');
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
-		return $this->outputJsonSuccess(true);
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 
 	public function loadDokumente()
diff --git a/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php b/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php
index d4f50e69c..fc601770d 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php
@@ -29,7 +29,7 @@ class NotizPrestudent extends Notiz_Controller
 	{
 		if($typeId != "prestudent_id")
 		{
-			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
 		//TODO define permission
@@ -37,8 +37,8 @@ class NotizPrestudent extends Notiz_Controller
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizProjekt.php b/application/controllers/api/frontend/v1/notiz/NotizProjekt.php
index 180f58b1b..9cdde36ae 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizProjekt.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizProjekt.php
@@ -17,7 +17,7 @@ class NotizProjekt extends Notiz_Controller
 	{
 		if($typeId != "projekt_kurzbz")
 		{
-			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
 		//TODO define permission
@@ -25,8 +25,8 @@ class NotizProjekt extends Notiz_Controller
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizProjektphase.php b/application/controllers/api/frontend/v1/notiz/NotizProjektphase.php
index 071aae6a5..7a82c658e 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizProjektphase.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizProjektphase.php
@@ -17,7 +17,7 @@ class NotizProjektphase extends Notiz_Controller
 	{
 		if($typeId != "projektphase_id")
 		{
-			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
 		//TODO define permission
@@ -25,8 +25,8 @@ class NotizProjektphase extends Notiz_Controller
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizProjekttask.php b/application/controllers/api/frontend/v1/notiz/NotizProjekttask.php
index 4d407051a..aadb04f40 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizProjekttask.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizProjekttask.php
@@ -17,7 +17,7 @@ class NotizProjekttask extends Notiz_Controller
 	{
 		if($typeId != "projekttask_id")
 		{
-			return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
 		//TODO define permission
@@ -25,8 +25,8 @@ class NotizProjekttask extends Notiz_Controller
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 }
\ No newline at end of file
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index fc8f79540..baf987abc 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -96,13 +96,13 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
+		$this->terminateWithSuccess(getData($result) ?: []);
 	}
 
 
 	//Override function
 	protected function isBerechtigt($id, $typeId){
-		return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
+		$this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
 	}
 
 	public function loadNotiz()
@@ -142,14 +142,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$uid = getAuthUID();
 
-		if (isset($_POST['data']))
-		{
-			$data = json_decode($_POST['data']);
-			unset($_POST['data']);
-			foreach ($data as $k => $v) {
-				$_POST[$k] = $v;
-			}
-		}
+		$json = $this->input->post('data');
+		$post_data = json_decode($json, true);
+		$this->form_validation->set_data($post_data);
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -165,26 +160,25 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$titel = $this->input->post('titel');
-		$text = $this->input->post('text');
-		$erledigt = $this->input->post('erledigt');
-		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
-		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
-		$type = $this->input->post('typeId');
-		$start = $this->input->post('start');
-		$ende = $this->input->post('ende');
+		$titel =  $post_data['titel'];
+		$text = $post_data['text'];
+		$erledigt = $post_data['erledigt'];
+		$bearbeiter_uid = isset($post_data['bearbeiter']) ? $post_data['bearbeiter'] : null;
+		$type = $post_data['typeId'];
+		$start = isset($post_data['start']) ? $post_data['start'] : null;
+		$ende = isset($post_data['ende']) ? $post_data['ende'] : null;
 
 		// Start DB transaction
 		$this->db->trans_start();
 
 		//Save note
-		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
-			"insertvon" => $verfasser_uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
+		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $uid,
+			"insertvon" => $uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
 
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		$notiz_id = $result->retval;
@@ -219,7 +213,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			if (isError($result))
 			{
 				$this->db->trans_rollback();
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			$dms_id_arr[] = $result->retval['dms_id'];
 		}
@@ -234,12 +228,12 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				if (isError($result))
 				{
 					$this->db->trans_rollback();
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 			}
 		}
 		$this->db->trans_commit();
-		return $this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function updateNotiz()
@@ -247,21 +241,14 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$this->load->library('form_validation');
 		$this->load->library('DmsLib');
 
-		if (isset($_POST['data']))
-		{
-			$data = json_decode($_POST['data']);
-			unset($_POST['data']);
-			foreach ($data as $k => $v) {
-				$_POST[$k] = $v;
-			}
-		}
+		$json = $this->input->post('data');
+		$post_data = json_decode($json, true);
 
-		$notiz_id = $this->input->post('notiz_id');
+		$this->form_validation->set_data($post_data);
 
-		if(!$notiz_id)
-		{
-			$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
-		}
+		$this->form_validation->set_rules('notiz_id', 'Notiz ID', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'notiz_id'])
+		]);
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -279,25 +266,23 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		//update Notiz
 		$uid = getAuthUID();
-		$titel = $this->input->post('titel');
-		$text = $this->input->post('text');
-		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
-		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
-		$erledigt = $this->input->post('erledigt');
-		$start = $this->input->post('start');
-		$ende = $this->input->post('ende');
+		$titel = $post_data['titel'];
+		$text = $post_data['text'];
+		$bearbeiter_uid = isset($post_data['bearbeiter']) ? $post_data['bearbeiter'] : $post_data['bearbeiter_uid'];
+		$erledigt = $post_data['erledigt'];
+		$start = $post_data['start'];
+		$ende = $post_data['ende'];
 
 		$result = $this->NotizModel->update(
 			[
-				'notiz_id' => $notiz_id
+				'notiz_id' => $post_data['notiz_id'],
 			],
 			[
 				'titel' =>  $titel,
 				'updatevon' => $uid,
 				'updateamum' => date('c'),
 				'text' => $text,
-				'verfasser_uid' => $verfasser_uid,
-				'bearbeiter_uid' => $bearbeiter_uid,
+				'bearbeiter_uid' => isEmptyString($bearbeiter_uid) ? null : $bearbeiter_uid,
 				'start' => $start,
 				'ende' => $ende,
 				'erledigt' => $erledigt
@@ -305,7 +290,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		);
 		if (isError($result))
 		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		//update(1) loading all dms-entries with this notiz_id
@@ -313,7 +298,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
 
-		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $post_data['notiz_id']));
 		$result = $this->getDataOrTerminateWithError($result);
 		foreach ($result as $doc) {
 			$dms_id_arr[$doc->dms_id] = array(
@@ -350,7 +335,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				$result = $this->getDataOrTerminateWithError($result);
 				$dms_id = $result['dms_id'];
 
-				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $post_data['notiz_id'], 'dms_id' => $dms_id));
 
 				$this->getDataOrTerminateWithError($result);
 			}
@@ -364,7 +349,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->getDataOrTerminateWithError($result);
 		}
 
-		return $this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function deleteNotiz()
@@ -415,15 +400,15 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		if(!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->db->trans_complete();
-		return $this->terminateWithSuccess(getData($result));
+		$this->terminateWithSuccess(getData($result));
 	}
 
 	public function loadDokumente()
@@ -439,14 +424,14 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			array('public.tbl_notiz.notiz_id' => $notiz_id)
 		);
 		if (isError($result)) {
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		if(!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess(getData($result));
+		$this->terminateWithSuccess(getData($result));
 	}
 
 	public function getMitarbeiter($searchString)
@@ -456,7 +441,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($result);
 	}
 
 }
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 13e969c50..00e66813f 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -1,5 +1,4 @@
 import VueDatePicker from '../vueDatepicker.js.php';
-import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import FormUploadDms from '../Form/Upload/Dms.js';
 import {CoreFilterCmpt} from "../filter/Filter.js";
 import BsModal from "../Bootstrap/Modal.js";
@@ -11,7 +10,6 @@ export default {
 	components: {
 		CoreFilterCmpt,
 		VueDatePicker,
-		PvAutoComplete,
 		FormUploadDms,
 		FormForm,
 		FormInput,
@@ -281,6 +279,7 @@ export default {
 				showId: false,
 				showLastupdate: false
 			},
+			currentVerfasserUid: null
 		}
 	},
 	methods: {
@@ -308,8 +307,6 @@ export default {
 					this.notizData.bis = this.notizen.ende;
 					this.notizData.document = this.notizen.dms_id;
 					this.notizData.erledigt = this.notizen.erledigt;
-					this.notizData.verfasser = this.notizen.verfasser_uid;
-					this.notizData.intVerfasser = this.notizen.verfasser_uid;
 					this.notizData.intBearbeiter = this.notizen.bearbeiter_uid;
 					this.notizData.bearbeiter = this.notizen.bearbeiter_uid;
 				}
@@ -373,6 +370,7 @@ export default {
 					this.notizData = result.data;
 					this.notizData.typeId = this.typeId;
 					this.notizData.anhang = [];
+					this.currentVerfasserUid = result.data.verfasser_uid;
 					return result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -425,16 +423,17 @@ export default {
 				bis: null,
 				document: null,
 				erledigt: false,
-				verfasser: this.uid,
 				bearbeiter: null,
-				anhang: []
+				anhang: [],
 			};
+			this.currentVerfasserUid = this.uid
 		},
 		getUid() {
 			return this.$api
 				.call(this.endpoint.getUid())
 				.then(result => {
-					this.notizData.intVerfasser = result.data;
+					this.currentVerfasserUid = result.data;
+					this.uid = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -518,14 +517,7 @@ export default {
 			},
 			deep: true
 		},
-		'notizData.intVerfasser': {
-			handler(newVal) {
-				if (typeof newVal === 'object') {
-					this.notizData.verfasser = newVal.mitarbeiter_uid;
-				}
-			},
-			deep: true
-		},
+
 		id() {
 			this.reload();
 		}
@@ -627,24 +619,23 @@ export default {
 					<div class="row mb-3">
 						<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','verfasser')}}</label>
 											
-						<div v-if="notizData.verfasser_uid" class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="notizData.verfasser_uid">
-						</div>
-						<div v-else class="col-sm-3">
-							<PvAutoComplete v-model="notizData.intVerfasser" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
+						<div class="col-sm-3">
+							<input type="text" readonly="readonly" class="form-control" id="name" v-model="currentVerfasserUid">
 						</div>
 						
 						<label for="von" class="form-label col-sm-1">{{$p.t('global','gueltigVon')}}</label>
 						<div class="col-sm-3">
-							<vue-date-picker
-								id="von"
-								v-model="notizData.start"
-								clearable="false"
+							<form-input
+								type="DatePicker"
+								v-model="notizData['start']"
+								name="von"
 								auto-apply
 								:enable-time-picker="false"
 								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
 								:teleport="true"
-								preview-format="dd.MM.yyyy"></vue-date-picker>
+								>
+							</form-input>
 						</div>
 					</div>
 					
@@ -652,26 +643,35 @@ export default {
 						<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','bearbeiter')}}</label>
 						
 						<div v-if="notizData.bearbeiter_uid" class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="notizData.bearbeiter_uid">
+							<input type="text" class="form-control" id="name" v-model="notizData.bearbeiter_uid">
 						</div>
 						
 						<div v-else class="col-sm-3">
-							<PvAutoComplete v-model="notizData.intBearbeiter" optionLabel="mitarbeiter" :suggestions="filteredMitarbeiter" @complete="search" minlength="3"/>
+							<form-input
+								type="autocomplete"
+								v-model="notizData.intBearbeiter"
+								:suggestions="filteredMitarbeiter" 
+								@complete="search" 
+								optionLabel="mitarbeiter"
+								minlength="3"
+							>
+							</form-input>
 						</div>
 						
 						
 						<label for="bis" class="form-label col-sm-1">{{$p.t('global','gueltigBis')}}</label>
 						<div class="col-sm-3">
-							<vue-date-picker
-								id="bis"
+							<form-input
+								type="DatePicker"
 								v-model="notizData.ende"
-								clearable="false"
+								name="bis"
 								auto-apply
 								:enable-time-picker="false"
 								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
 								:teleport="true"
-								preview-format="dd.MM.yyyy">
-							</vue-date-picker>
+								>
+							</form-input>
 						</div>
 					</div>
 										
@@ -811,28 +811,15 @@ export default {
 							
 							<div class="row mb-3">
 								<form-input 
-									v-if="notizData.verfasser_uid"
 									container-class="col-6"
 									:label="$p.t('notiz', 'verfasser')"
 									type="text"
-									v-model="notizData.verfasser_uid"
-									name="titel"
+									readonly="readonly"
+									v-model="currentVerfasserUid"
+									name="verfasser"
 									>
 								</form-input>
-						
-								<form-input
-									v-else
-									container-class="col-6"
-									:label="$p.t('notiz', 'verfasser')"
-									type="autocomplete"
-									v-model="notizData.intVerfasser"
-									:suggestions="filteredMitarbeiter" 
-									@complete="search" 
-									optionLabel="mitarbeiter"
-									minLength="3"
-									>
-								</form-input>
-								
+
 								<form-input
 									v-if="notizData.bearbeiter_uid"
 									container-class="col-6"
@@ -977,25 +964,12 @@ export default {
 					
 							<div class="row mb-3">
 								<form-input 
-									v-if="notizData.verfasser_uid"
 									container-class="col-6"
 									:label="$p.t('notiz', 'verfasser')"
 									type="text"
-									v-model="notizData.verfasser_uid"
-									name="titel"
-									>
-								</form-input>
-						
-								<form-input
-									v-else
-									container-class="col-6"
-									:label="$p.t('notiz', 'verfasser')"
-									type="autocomplete"
-									v-model="notizData.intVerfasser"
-									:suggestions="filteredMitarbeiter" 
-									@complete="search" 
-									optionLabel="mitarbeiter"
-									minLength="3"
+									readonly="readonly"
+									v-model="currentVerfasserUid"
+									name="verfasser"
 									>
 								</form-input>
 								
@@ -1164,28 +1138,15 @@ export default {
 					
 							<div class="row mb-3">
 								<form-input 
-									v-if="notizData.verfasser_uid"
 									container-class="col-6"
 									:label="$p.t('notiz', 'verfasser')"
 									type="text"
-									v-model="notizData.verfasser_uid"
-									name="titel"
+									readonly="readonly"
+									v-model="currentVerfasserUid"
+									name="verfasser"
 									>
 								</form-input>
-						
-								<form-input
-									v-else
-									container-class="col-6"
-									:label="$p.t('notiz', 'verfasser')"
-									type="autocomplete"
-									v-model="notizData.intVerfasser"
-									:suggestions="filteredMitarbeiter" 
-									@complete="search" 
-									optionLabel="mitarbeiter"
-									minLength="3"
-									>
-								</form-input>
-								
+					
 								<form-input
 									v-if="notizData.bearbeiter_uid"
 									container-class="col-6"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 8bfbbe19c..e00993302 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -22,7 +22,7 @@ export default {
 			class="overflow-hidden"
 			:endpoint="endpoint"
 			ref="formc"
-			notiz-layout="twoColumnsFormLeft"
+			notiz-layout="popupModal"
 			type-id="person_id"
 			:id="modelValue.person_id"
 			show-document

From 890b50c8300757b3bf4b69eddbf418456aa997b8 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 1 Oct 2025 13:13:41 +0200
Subject: [PATCH 03/37] add new api for notiz

---
 .../frontend/v1/notiz/NotizLehreinheit.php    |  5 ++++
 public/js/api/factory/notiz/anrechnung.js     | 29 +++++++++++++++++++
 public/js/api/factory/notiz/bestellung.js     | 29 +++++++++++++++++++
 public/js/api/factory/notiz/mitarbeiter.js    | 29 +++++++++++++++++++
 public/js/api/factory/notiz/prestudent.js     | 29 +++++++++++++++++++
 public/js/api/factory/notiz/projekt.js        | 29 +++++++++++++++++++
 public/js/api/factory/notiz/projektphase.js   | 29 +++++++++++++++++++
 public/js/api/factory/notiz/projekttask.js    | 29 +++++++++++++++++++
 8 files changed, 208 insertions(+)
 create mode 100644 public/js/api/factory/notiz/anrechnung.js
 create mode 100644 public/js/api/factory/notiz/bestellung.js
 create mode 100644 public/js/api/factory/notiz/mitarbeiter.js
 create mode 100644 public/js/api/factory/notiz/prestudent.js
 create mode 100644 public/js/api/factory/notiz/projekt.js
 create mode 100644 public/js/api/factory/notiz/projektphase.js
 create mode 100644 public/js/api/factory/notiz/projekttask.js

diff --git a/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php b/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
index 4354562b6..e011c6d60 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
@@ -25,6 +25,11 @@ class NotizLehreinheit extends Notiz_Controller
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 
+		//Permission checks for allowed Oes
+/*		$allowedOes = $this->permissionlib->getOE_isEntitledFor('assistenz') ?: [];
+
+		$this->terminateWithSuccess($allowedOes);*/
+
 		// Load language phrases
 		$this->loadPhrases([
 			'ui'
diff --git a/public/js/api/factory/notiz/anrechnung.js b/public/js/api/factory/notiz/anrechnung.js
new file mode 100644
index 000000000..ba458abf5
--- /dev/null
+++ b/public/js/api/factory/notiz/anrechnung.js
@@ -0,0 +1,29 @@
+/**
+ * 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 Person from './person.js';
+
+export default {
+
+	...Person,
+	getNotizen(id, type) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizAnrechnung/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
+		};
+	},
+};
diff --git a/public/js/api/factory/notiz/bestellung.js b/public/js/api/factory/notiz/bestellung.js
new file mode 100644
index 000000000..3d94a7c25
--- /dev/null
+++ b/public/js/api/factory/notiz/bestellung.js
@@ -0,0 +1,29 @@
+/**
+ * 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 Person from './person.js';
+
+export default {
+
+	...Person,
+	getNotizen(id, type) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizBestellung/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
+		};
+	},
+};
\ No newline at end of file
diff --git a/public/js/api/factory/notiz/mitarbeiter.js b/public/js/api/factory/notiz/mitarbeiter.js
new file mode 100644
index 000000000..6ddb89af7
--- /dev/null
+++ b/public/js/api/factory/notiz/mitarbeiter.js
@@ -0,0 +1,29 @@
+/**
+ * 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 Person from './person.js';
+
+export default {
+
+	...Person,
+	getNotizen(id, type) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizMitarbeiter/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
+		};
+	},
+};
\ No newline at end of file
diff --git a/public/js/api/factory/notiz/prestudent.js b/public/js/api/factory/notiz/prestudent.js
new file mode 100644
index 000000000..f117a77ff
--- /dev/null
+++ b/public/js/api/factory/notiz/prestudent.js
@@ -0,0 +1,29 @@
+/**
+ * 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 Person from './person.js';
+
+export default {
+
+	...Person,
+	getNotizen(id, type) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizPrestudent/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
+		};
+	},
+};
\ No newline at end of file
diff --git a/public/js/api/factory/notiz/projekt.js b/public/js/api/factory/notiz/projekt.js
new file mode 100644
index 000000000..f1dab754d
--- /dev/null
+++ b/public/js/api/factory/notiz/projekt.js
@@ -0,0 +1,29 @@
+/**
+ * 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 Person from './person.js';
+
+export default {
+
+	...Person,
+	getNotizen(id, type) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizProjekt/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
+		};
+	},
+};
\ No newline at end of file
diff --git a/public/js/api/factory/notiz/projektphase.js b/public/js/api/factory/notiz/projektphase.js
new file mode 100644
index 000000000..6762e8456
--- /dev/null
+++ b/public/js/api/factory/notiz/projektphase.js
@@ -0,0 +1,29 @@
+/**
+ * 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 Person from './person.js';
+
+export default {
+
+	...Person,
+	getNotizen(id, type) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizProjektphase/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
+		};
+	},
+};
\ No newline at end of file
diff --git a/public/js/api/factory/notiz/projekttask.js b/public/js/api/factory/notiz/projekttask.js
new file mode 100644
index 000000000..27a74bb08
--- /dev/null
+++ b/public/js/api/factory/notiz/projekttask.js
@@ -0,0 +1,29 @@
+/**
+ * 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 Person from './person.js';
+
+export default {
+
+	...Person,
+	getNotizen(id, type) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizProjekttask/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
+		};
+	},
+};
\ No newline at end of file

From e79bb607d940412a4ba5647acaed8a9789196a99 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 3 Oct 2025 10:23:25 +0200
Subject: [PATCH 04/37] add permission validation oe for lehreinheit

---
 .../frontend/v1/notiz/NotizLehreinheit.php    | 75 ++++++++++++++++++-
 application/core/Notiz_Controller.php         |  2 +-
 public/js/api/factory/notiz/lehreinheit.js    | 25 +++++++
 public/js/components/Notiz/Notiz.js           |  4 +
 4 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php b/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
index e011c6d60..a3b96d477 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
@@ -21,14 +21,67 @@ class NotizLehreinheit extends Notiz_Controller
 		//Load Models
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 
 		//Permission checks for allowed Oes
-/*		$allowedOes = $this->permissionlib->getOE_isEntitledFor('assistenz') ?: [];
+		$allowedOes = $this->permissionlib->getOE_isEntitledFor('assistenz') ?: [];
 
-		$this->terminateWithSuccess($allowedOes);*/
+		if ($this->router->method == 'addNewNotiz')
+		{
+			$json = $this->input->post('data');
+			$post_data = json_decode($json, true);
+			$lehreinheit_id = $post_data['id'];
+
+			if(!$lehreinheit_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
+		}
+
+		if ($this->router->method == 'updateNotiz')
+		{
+			$json = $this->input->post('data');
+			$post_data = json_decode($json, true);
+			$notiz_id = $post_data['notiz_id'];
+
+			if(!$notiz_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
+			}
+
+			//get lehreinheit_id
+			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
+
+			$data = $this->getDataOrTerminateWithError($result);
+			$lehreinheit_id = current($data)->lehreinheit_id;
+
+			if(!$lehreinheit_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
+		}
+
+		if ($this->router->method == 'deleteNotiz')
+		{
+			$notiz_id = $this->input->post('notiz_id');
+			$lehreinheit_id = $this->input->post('id');
+
+			if(!$notiz_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
+			}
+
+			if(!$lehreinheit_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
+		}
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -36,14 +89,26 @@ class NotizLehreinheit extends Notiz_Controller
 		]);
 	}
 
+	private function _checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes)
+	{
+		//get oe from lehreinheit
+		$result = $this->LehreinheitModel->getOes($lehreinheit_id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$oes = current($data);
+
+		if (!in_array($oes, $allowedOes))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg') . " " . $oes, self::ERROR_TYPE_GENERAL);
+		}
+	}
+
 	public function isBerechtigt($id, $typeId)
 	{
-		if($typeId != "lehreinheit_id")
+			if($typeId != "lehreinheit_id")
 		{
 			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
-		//TODO define permission
 		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
@@ -52,4 +117,6 @@ class NotizLehreinheit extends Notiz_Controller
 		}
 		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
+
+
 }
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index daee7c334..923970923 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -112,7 +112,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$notiz_id = $this->input->post('notiz_id');
 
-		//$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
 		$this->NotizModel->addSelect('*');
 		$this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum 
@@ -239,6 +238,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 	public function updateNotiz()
 	{
+
 		$this->load->library('form_validation');
 		$this->load->library('DmsLib');
 
diff --git a/public/js/api/factory/notiz/lehreinheit.js b/public/js/api/factory/notiz/lehreinheit.js
index d93bb50f9..762e5c596 100644
--- a/public/js/api/factory/notiz/lehreinheit.js
+++ b/public/js/api/factory/notiz/lehreinheit.js
@@ -26,4 +26,29 @@ export default {
 			url: 'api/frontend/v1/notiz/notizLehreinheit/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
 		};
 	},
+	addNewNotiz(lehreinheit_id, params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/notiz/notizLehreinheit/addNewNotiz/' + lehreinheit_id,
+			params
+		};
+	},
+	updateNotiz(notiz_id, params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/notiz/notizLehreinheit/updateNotiz/' + notiz_id,
+			params
+		};
+	},
+	deleteNotiz(notiz_id, type_id, id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/notiz/notizLehreinheit/deleteNotiz/',
+			params: {
+				notiz_id,
+				type_id,
+				id
+			}
+		};
+	},
 };
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index a8038e774..c24402b33 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -267,6 +267,7 @@ export default {
 			editor: null,
 			notizData: {
 				typeId: this.typeId,
+				id: this.id,
 				titel: null,
 				statusNew: true,
 				text: '',
@@ -344,6 +345,7 @@ export default {
 		},
 		addNewNotiz() {
 			const formData = new FormData();
+			this.notizData.id = this.id;
 
 			formData.append('data', JSON.stringify(this.notizData));
 			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
@@ -1171,6 +1173,7 @@ export default {
 									container-class="col-6"
 									:label="$p.t('notiz', 'bearbeiter')"
 									v-model="notizData.bearbeiter_uid"
+									name="bearbeiter"
 									minlength="3"
 									>
 								</form-input>
@@ -1184,6 +1187,7 @@ export default {
 									:suggestions="filteredMitarbeiter" 
 									@complete="search" 
 									optionLabel="mitarbeiter"
+									name="bearbeiter"
 									minlength="3"
 									>
 								</form-input>	

From 984d81edb6c4312afe332eb3e7deeeb01b9e11de Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 6 Oct 2025 16:37:17 +0200
Subject: [PATCH 05/37] add tag component to List.js, add column tags to table,
 add functionality add, delete and update

---
 application/config/stv.php                    |   7 +
 .../controllers/api/frontend/v1/stv/Tags.php  |  80 +++++
 application/views/Studentenverwaltung.php     |   4 +-
 public/js/api/factory/stv/tag.js              |  54 +++
 .../Stv/Studentenverwaltung/List.js           | 317 +++++++++++++++++-
 5 files changed, 456 insertions(+), 6 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Tags.php
 create mode 100644 public/js/api/factory/stv/tag.js

diff --git a/application/config/stv.php b/application/config/stv.php
index 42afc318c..d9519bd6e 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -113,3 +113,10 @@ $config['students_tab_order'] = [
 	'finalexam',
 	'archive',
 ];
+
+$config['stv_prestudent_tags'] = [
+	'tag_1' => ['readonly' => false],
+	'tag_2' => ['readonly' => true],
+	'tag_3' => ['readonly' => false],
+	'tag_4' => ['readonly' => true]
+];
diff --git a/application/controllers/api/frontend/v1/stv/Tags.php b/application/controllers/api/frontend/v1/stv/Tags.php
new file mode 100644
index 000000000..397b2abbe
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Tags.php
@@ -0,0 +1,80 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Tags extends Tag_Controller
+{
+	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
+
+	public function __construct()
+	{
+		parent::__construct([
+			'getTag' => self::BERECHTIGUNG_KURZBZ,
+			'getTags' => self::BERECHTIGUNG_KURZBZ,
+			'addTag' => self::BERECHTIGUNG_KURZBZ,
+			'updateTag' => self::BERECHTIGUNG_KURZBZ,
+			'doneTag' => self::BERECHTIGUNG_KURZBZ,
+			'deleteTag' => self::BERECHTIGUNG_KURZBZ,
+/*			'updateLehre' => self::BERECHTIGUNG_KURZBZ,
+			'doneLehre' => self::BERECHTIGUNG_KURZBZ,
+			'deleteLehre' => self::BERECHTIGUNG_KURZBZ,*/
+		]);
+
+		$this->config->load('lvverwaltung');
+	}
+	public function getTag($readonly_tags = null)
+	{
+		parent::getTag($this->config->item('lvverwaltung_tags'));
+	}
+	public function getTags($tags = null)
+	{
+		parent::getTags($this->config->item('lvverwaltung_tags'));
+	}
+	public function addTag($withZuordnung = true, $updatable_tags = null)
+	{
+		parent::addTag(true, $this->config->item('lvverwaltung_tags'));
+	}
+	public function updateTag($updatable_tags = null)
+	{
+		parent::updateTag($this->config->item('lvverwaltung_tags'));
+	}
+	public function deleteTag($withZuordnung = true, $updatable_tags = null)
+	{
+		parent::deleteTag(true, $this->config->item('lvverwaltung_tags'));
+	}
+	public function doneTag($updatable_tags = null)
+	{
+		parent::doneTag($this->config->item('lvverwaltung_tags'));
+	}
+
+	/*$this->config->load('stv');
+	}
+
+	public function getTag($readonly_tags = null)
+	{
+	//	console.log("in this endpoint. getTags");
+		parent::getTag($this->config->item('stv_prestudent_tags'));
+	}
+	public function getTags($tags = null)
+	{
+	//	$this->terminateWithError(" IN TAGS.PHP ", self::ERROR_TYPE_GENERAL);
+		parent::getTags($this->config->item('stv_prestudent_tags'));
+	}
+	public function addTag($withZuordnung = true, $updatable_tags = null)
+	{
+		parent::addTag(true, $this->config->item('stv_prestudent_tags'));
+	}
+	public function updateTag($updatable_tags = null)
+	{
+		parent::updateTag($this->config->item('stv_prestudent_tags'));
+	}
+	public function deleteTag($withZuordnung = true, $updatable_tags = null)
+	{
+		parent::deleteTag(true, $this->config->item('stv_prestudent_tags'));
+	}
+	public function doneTag($updatable_tags = null)
+	{
+		parent::doneTag($this->config->item('stv_prestudent_tags'));
+	}*/
+}
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 01e611657..3c4938c0d 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -14,12 +14,14 @@
 			'ui',
 			'notiz',
 		),
+		'tags' => true,
 		'customCSSs' => [
 			#datepicker fuer component functions
 			'public/css/components/vue-datepicker.css',
 			'public/css/components/primevue.css',
 			'public/css/Studentenverwaltung.css',
-			'public/css/components/function.css'
+			'public/css/components/function.css',
+			//'public/css/Lvverwaltung.css' //css tags?
 		],
 		'customJSs' => [
 			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'
diff --git a/public/js/api/factory/stv/tag.js b/public/js/api/factory/stv/tag.js
new file mode 100644
index 000000000..29675f6d4
--- /dev/null
+++ b/public/js/api/factory/stv/tag.js
@@ -0,0 +1,54 @@
+export default {
+
+	getTag(data)
+	{
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/Tags/getTag',
+			params: data
+		};
+	},
+
+	getTags(data)
+	{
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/Tags/getTags'
+		};
+	},
+
+	addTag(data)
+	{
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/Tags/addTag',
+			params: data
+		};
+	},
+
+	updateTag(data)
+	{
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/Tags/updateTag',
+			params: data
+		};
+	},
+	doneTag(data)
+	{
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/Tags/doneTag',
+			params: data
+		};
+	},
+
+	deleteTag(data)
+	{
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/Tags/deleteTag',
+			params: data
+		};
+	},
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 67cada523..3d46dc32f 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -1,12 +1,17 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import ListNew from './List/New.js';
+import CoreTag from '../../Tag/Tag.js';
+import { tagHeaderFilter } from "../../../tabulator/filters/extendedHeaderFilter.js";
+import { extendedHeaderFilter } from "../../../tabulator/filters/extendedHeaderFilter.js";
+import ApiTag from "../../../api/factory/stv/tag.js";
 
 
 export default {
 	name: "ListPrestudents",
 	components: {
 		CoreFilterCmpt,
-		ListNew
+		ListNew,
+		CoreTag
 	},
 	inject: {
 		'lists': {
@@ -45,6 +50,81 @@ export default {
 				columns:[
 					{title:"UID", field:"uid", headerFilter: true},
 					{title:"TitelPre", field:"titelpre", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{
+						title: 'Tags',
+						field: 'tags',
+						tooltip: false,
+						headerFilter: "input",
+						headerFilterFunc: tagHeaderFilter,
+						headerFilterFuncParams: {field: 'tags'},
+						formatter: (cell) => {
+							let tags = cell.getValue();
+							if (!tags) return;
+
+							let container = document.createElement('div');
+							container.className = "d-flex gap-1";
+
+							let parsedTags = JSON.parse(tags);
+							let maxVisibleTags = 2;
+
+							const rowData = cell.getRow().getData();
+							if (rowData._tagExpanded === undefined) {
+								rowData._tagExpanded = false;
+							}
+
+							const renderTags = () => {
+								container.innerHTML = '';
+								parsedTags = parsedTags.filter(item => item !== null);
+
+								parsedTags.sort((a, b) => {
+									let adone = a.done ? 1 : 0;
+									let bbone = b.done ? 1 : 0;
+
+									if (adone !== bbone)
+									{
+										return adone - bbone;
+									}
+									return b.id - a.id;
+								});
+								const tagsToShow = rowData._tagExpanded ? parsedTags : parsedTags.slice(0, maxVisibleTags);
+
+								tagsToShow.forEach(tag => {
+									if (!tag) return;
+									let tagElement = document.createElement('span');
+									tagElement.innerText = tag.beschreibung;
+									tagElement.title = tag.notiz;
+									tagElement.className = "tag " + tag.style;
+									if (tag.done) tagElement.className += " tag_done";
+
+									tagElement.addEventListener('click', (event) => {
+										event.stopPropagation();
+										event.preventDefault();
+										this.$refs.tagComponent.editTag(tag.id);
+									});
+
+									container.appendChild(tagElement);
+								});
+
+								if (parsedTags.length > maxVisibleTags) {
+									let toggle = document.createElement('button');
+									toggle.innerText = (rowData._tagExpanded ? '- ' : '+ ') + (parsedTags.length - maxVisibleTags);
+									toggle.className = "display_all";
+									toggle.title = rowData._tagExpanded ? "Tags ausblenden" : "Tags einblenden";
+
+									toggle.addEventListener('click', () => {
+										rowData._tagExpanded = !rowData._tagExpanded;
+										renderTags();
+									});
+
+									container.appendChild(toggle);
+								}
+							};
+
+							renderTags();
+							return container;
+						},
+						width: 150,
+					},
 					{title:"Nachname", field:"nachname", headerFilter: true},
 					{title:"Vorname", field:"vorname", headerFilter: true},
 					{title:"Wahlname", field:"wahlname", visible:false, headerFilter: true},
@@ -131,7 +211,7 @@ export default {
 				selectable: true,
 				selectableRangeMode: 'click',
 				index: 'prestudent_id',
-				persistenceID: 'stv-list'
+				persistenceID: 'stv-list',
 			},
 			tabulatorEvents: [
 				{
@@ -140,7 +220,11 @@ export default {
 				},
 				{
 					event: 'dataProcessed',
-					handler: this.autoSelectRows
+					//handler: this.autoSelectRows TODO(Manu) combine
+					handler: (data) => {
+						this.reexpandRows()
+						this.$emit('update:selected', {})
+					}
 				},
 				{
 					event: 'dataLoaded',
@@ -153,6 +237,18 @@ export default {
 				{
 					event: 'rowClick',
 					handler: this.handleRowClick // TODO(chris): this should be in the filter component
+				},
+				{
+					event: 'dataTreeRowExpanded',
+					handler: (data) => {
+						this.getExpandedRows()
+					}
+				},
+				{
+					event: 'dataTreeRowCollapsed',
+					handler: (data) => {
+						this.getExpandedRows()
+					}
 				}
 			],
 			focusObj: null, // TODO(chris): this should be in the filter component
@@ -162,7 +258,11 @@ export default {
 			count: 0,
 			filteredcount: 0,
 			selectedcount: 0,
-			currentEndpointRawUrl: ''
+			currentEndpointRawUrl: '',
+			//tags
+			expanded: [],
+			selectedColumnValues: [],
+			tagEndpoint: ApiTag
 		}
 	},
 	methods: {
@@ -175,6 +275,11 @@ export default {
 		rowSelectionChanged(data) {
 			this.selectedcount = data.length;
 			this.lastSelected = this.selected;
+
+			//for tags
+			this.selectedRows = this.$refs.table.tabulator.getSelectedRows();
+			this.selectedColumnValues = this.selectedRows.filter(row => row.getData().uid !== undefined && row.getData().uid).map(row => row.getData().uid);
+
 			this.$emit('update:selected', data);
 		},
 		autoSelectRows(data) {
@@ -294,7 +399,194 @@ export default {
 				if (el != this.focusObj)
 					this.changeFocus(this.focusObj, el);
 			}
-		}
+		},
+		//methods tags
+		addedTag(addedTag)
+		{
+			console.log("addedTag");
+			const table = this.$refs.table.tabulator;
+
+			this.selectedRows.forEach(row =>
+			{
+				if (Array.isArray(addedTag.response))
+				{
+					addedTag.response.forEach(tag => {
+						const targetRow = this.allRows.find(row => row.getData().uid === tag.uid);
+						if (targetRow)
+						{
+							const rowData = targetRow.getData();
+							let tags = [];
+							try {
+								tags = JSON.parse(rowData.tags || '[]');
+							} catch (e) {}
+
+							const tagExists = tags.some((t) => t.id === tag.id);
+							if (!tagExists)
+							{
+								addedTag.id = tag.id;
+								tags.unshift({ ...addedTag });
+								targetRow.update({ tags: JSON.stringify(tags) });
+								targetRow.reformat();
+							}
+						}
+					});
+				}
+			});
+		},
+		deletedTag(deletedTag) {
+			console.log("deletedTag");
+			const targetRow = this.allRows.find(row => {
+				const rowData = row.getData();
+
+				let tags = [];
+				try {
+					tags = JSON.parse(rowData.tags || '[]');
+				} catch (e) {}
+
+				return tags.some(tag => tag.id === deletedTag);
+			});
+
+			if (targetRow) {
+				const rowData = targetRow.getData();
+				let tags = [];
+
+				try {
+					tags = JSON.parse(rowData.tags || '[]');
+				} catch (e) {}
+
+				const filteredTags = tags.filter(t => t.id !== deletedTag);
+				const updatedTags = JSON.stringify(filteredTags);
+
+				if (updatedTags !== rowData.tags) {
+					targetRow.update({
+						tags: updatedTags
+					});
+
+					targetRow.reformat();
+				}
+			}
+		},
+		updatedTag(updatedTag) {
+			console.log("updatedTag");
+			const targetRow = this.allRows.find(row => {
+				const rowData = row.getData();
+				let tags = [];
+
+				try {
+					tags = JSON.parse(rowData.tags || '[]');
+				} catch (e) {}
+
+				return tags.some(t => t?.id === updatedTag.id);
+			});
+
+			if (targetRow)
+			{
+				const rowData = targetRow.getData();
+				let tags = [];
+				try {
+					tags = JSON.parse(rowData.tags || '[]');
+				} catch (e) {}
+
+				let changed = false;
+
+				const tagIndex = tags.findIndex(tag => tag?.id === updatedTag.id);
+				if (tagIndex !== -1) {
+					tags[tagIndex] = { ...updatedTag };
+					changed = true;
+				}
+
+				if (changed)
+				{
+					targetRow.update({
+						tags: JSON.stringify(tags),
+					});
+					targetRow.reformat();
+				}
+			}
+		},
+		resetTree() {
+			console.log("reset tree");
+			this.allRows.forEach(row => {
+				row._row.modules.dataTree.open = false;
+			});
+
+			let rootRows = this.$refs.table.tabulator.getRows(true);
+			var lastRow = rootRows[rootRows.length - 1];
+			lastRow?.treeCollapse(true)
+
+			this.currentTreeLevel = 0;
+		},
+		expandTree()
+		{
+			console.log("expandTree");
+			this.currentTreeLevel = (this.currentTreeLevel || 0) + 1;
+
+			let lastMatchingRow = null;
+
+			this.allRows.forEach(row => {
+				const level = row._row.modules.dataTree?.index ?? 0;
+
+				if (level === this.currentTreeLevel - 1 )
+				{
+					row._row.modules.dataTree.open = true;
+
+					if (row._row.data._children?.length > 0)
+					{
+						lastMatchingRow = row;
+					}
+				}
+			});
+
+			if (lastMatchingRow)
+			{
+				lastMatchingRow.treeExpand();
+			}
+			this.$refs.table.tabulator.redraw();
+		},
+		getAllRows(rows)
+		{
+			let result = [];
+			rows.forEach(row =>
+			{
+				result.push(row);
+				let children = row.getTreeChildren();
+				if(children && children.length > 0)
+				{
+					result = result.concat(this.getAllRows(children));
+				}
+			});
+			return result;
+		},
+		async getExpandedRows() {
+			this.expanded = [];
+
+			this.allRows.forEach(row => {
+				if (row.getTreeChildren().length > 0 && row.isTreeExpanded())
+				{
+					this.expanded.push(row.getData().uniqueindex);
+				}
+			});
+		},
+		reexpandRows() {
+			this.allRows = this.getAllRows(this.$refs.table.tabulator.getRows());
+
+			const matchingRows = this.allRows.filter(row =>
+				this.expanded.includes(row.getData().uniqueindex)
+			);
+
+			if (matchingRows.length === 0)
+				this.currentTreeLevel = 0;
+
+			matchingRows.forEach((row, index) => {
+				row._row.modules.dataTree.open = true;
+
+				if (index === matchingRows.length - 1)
+				{
+					row.treeExpand();
+				}
+			});
+		},
+
 	},
 	computed: {
 		countsToHTML: function() {
@@ -313,6 +605,7 @@ export default {
 	// TODO(chris): filter component column chooser has no accessibilty features
 	template: `
 	<div class="stv-list h-100 pt-3">
+	test manu {{selectedColumnValues}}
 		<div class="tabulator-container d-flex flex-column h-100" :class="{'has-filter': filterKontoCount0 || filterKontoMissingCounter}" tabindex="0" @focusin="onFocus" @keydown="onKeydown">
 			<core-filter-cmpt
 				ref="table"
@@ -328,6 +621,20 @@ export default {
 				:new-btn-label="$p.t('stv/action_new')"
 				@click:new="actionNewPrestudent"
 			>
+
+			<template #actions>
+				<core-tag ref="tagComponent"
+					:endpoint="tagEndpoint"
+					:values="selectedColumnValues"
+					@added="addedTag"
+					@deleted="deletedTag"
+					@updated="updatedTag"
+					zuordnung_typ="uid"
+				></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 #filter>
 				<div class="card">
 					<div class="card-body">

From 450789ed720689a4601a5d7d9b121e54f1476fa5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 8 Oct 2025 09:12:54 +0200
Subject: [PATCH 06/37] extend query getStudents, change zuordnung_type from
 uid to prestudent

---
 .../api/frontend/v1/stv/Students.php          |  21 ++-
 application/models/crm/Prestudent_model.php   | 166 ++++++++++++++++++
 .../Stv/Studentenverwaltung/List.js           |  68 +------
 3 files changed, 193 insertions(+), 62 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 9de0c29b1..b9f869ac3 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -430,7 +430,7 @@ 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 fetchStudentsWithoutTagsPrestudent($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');
@@ -496,7 +496,7 @@ class Students extends FHCAPI_Controller
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
 				$this->PrestudentModel->db->where(
 					"(
-						SELECT orgform_kurzbz 
+						SELECT orgform_kurzbz
 						FROM public.tbl_prestudentstatus 
 						WHERE prestudent_id=tbl_prestudent.prestudent_id 
 						AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . " 
@@ -518,6 +518,23 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	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');
+
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
+		$allowedStg = $this->allowedStgs;
+		$result = $this->PrestudentModel->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $allowedStg, $semester, $verband, $gruppe, $gruppe_kurzbz, $orgform_kurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+
 	/**
 	 * @param string		$prestudent_id
 	 *
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index ff56c3268..bd552d0c3 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -782,4 +782,170 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
+
+	/**
+	 * Version in raw sql to fetch Students for loading StudentList
+	 * @param integer $studiengang_kz
+	 * @param string $studiensemester_kurzbz
+	 * @param Array $allowedStg
+	 * @param integer $semester (optional)
+	 * @param string $verband (optional)
+	 * @param integer $gruppe (optional)
+	 * @param string $gruppe_kurzbz (optional)
+	 * @param string $orgform_kurzbz (optional)
+	 *
+	 * @return object
+	 */
+	public function fetchStudents($studiensemester_kurzbz, $studiengang_kz, $allowedStg, $semester, $verband, $gruppe, $gruppe_kurzbz, $orgform_kurzbz)
+	{
+
+		$stdsemEsc = $studiensemester_kurzbz ? $this->db->escape($studiensemester_kurzbz) : 'NULL';
+		$orgform_kurzbzEsc = $orgform_kurzbz ? $this->db->escape($orgform_kurzbz) : 'NULL';
+
+		$qry = "WITH prestudenten AS (
+					SELECT *
+					FROM public.tbl_prestudent
+							),
+			". $this->getTagsCTE() . "
+			SELECT b.uid,
+			  COALESCE(tag_data_agg.tags, '[]'::json) AS tags,
+			titelpre, nachname, vorname, wahlname, vornamen, titelpost, ersatzkennzeichen, gebdatum, geschlecht, foto, foto_sperre,
+			UPPER(stg.typ || stg.kurzbz) AS studiengang, tbl_prestudent.studiengang_kz, stg.bezeichnung AS stg_bezeichnung, s.matrikelnr,
+			p.person_id, pls.status_kurzbz AS status, pls.datum AS status_datum, pls.bestaetigtam AS status_bestaetigung,
+			(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat,
+			CASE
+				WHEN b.uid IS NOT NULL AND b.uid<>''
+				THEN CONCAT(b.uid, '@', " . $this->db->escape(DOMAIN) .")
+				ELSE ''
+			END AS mail_intern, p.anmerkung AS anmerkungen, tbl_prestudent.anmerkung, pls.orgform_kurzbz, aufmerksamdurch_kurzbz,
+			(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte,
+			tbl_prestudent.aufnahmegruppe_kurzbz, tbl_prestudent.dual, p.matr_nr, sp.bezeichnung AS studienplan_bezeichnung,
+			tbl_prestudent.prestudent_id, mentor, b.aktiv AS bnaktiv, v.semester, v.verband, v.gruppe, '' AS priorisierung_relativ,
+			(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = ?
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester
+				FROM public.tbl_prestudent
+				LEFT JOIN public.tbl_studiengang stg USING (studiengang_kz)
+				JOIN public.tbl_person p USING (person_id)
+				JOIN public.tbl_student s USING (prestudent_id)
+				LEFT JOIN public.tbl_prestudentstatus pls ON 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 JOIN lehre.tbl_studienplan sp USING (studienplan_id)
+				LEFT JOIN public.tbl_benutzer b ON s.student_uid=b.uid
+				JOIN public.tbl_studentlehrverband v ON v.student_uid=s.student_uid ";
+
+				$qry .= $studiensemester_kurzbz ? ' AND v.studiensemester_kurzbz = ' . $this->db->escape($studiensemester_kurzbz) : ' AND v.studiensemester_kurzbz =  IS NULL';
+
+				if($gruppe_kurzbz !== null)
+				{
+					$qry .= " JOIN public.tbl_benutzergruppe g USING (uid)";
+				}
+
+				$qry .= "
+				LEFT JOIN public.tbl_prestudentstatus ps ON ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ?)
+				AND ps.prestudent_id = tbl_prestudent.prestudent_id
+				AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ?)
+				AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ?)
+				LEFT JOIN tag_data_agg ON tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id
+				WHERE tbl_prestudent.studiengang_kz IN ?";
+
+				$params = array($stdsemEsc, $stdsemEsc, $stdsemEsc, $stdsemEsc, $allowedStg);
+
+				if (!$verband && !$gruppe && $orgform_kurzbz !== null)
+				{
+					$qry .= "
+					AND (
+						SELECT orgform_kurzbz
+						FROM public.tbl_prestudentstatus
+						WHERE prestudent_id=tbl_prestudent.prestudent_id
+						AND studiensemester_kurzbz=" . $stdsemEsc . "
+						ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
+					) =  " . $orgform_kurzbzEsc ;
+				}
+
+				if($semester !== null)
+				{
+					$qry .= " AND v.semester = ?";
+					$params[] = $semester;
+				}
+				if($verband !== null)
+				{
+					$qry .= " AND v.verband = ?";
+					$params[] = $verband;
+				}
+
+				if($gruppe !== null)
+				{
+					$qry .= " AND v.gruppe = ?";
+					$params[] = $gruppe;
+				}
+
+				if($gruppe_kurzbz !== null)
+				{
+					$qry .= " AND g.gruppe_kurzbz = ?";
+					$qry .= " AND g.studiensemester_kurzbz = ?";
+					$params[] = $gruppe_kurzbz;
+					$params[] = $stdsemEsc;
+				}
+				else
+				{
+					$qry .= " AND v.studiengang_kz = ?";
+					$params[] = $studiengang_kz;
+				}
+
+				$qry .= "
+					ORDER BY nachname ASC, vorname ASC
+				";
+		return $this->execReadOnlyQuery($qry, $params);
+	}
+
+	public function getTagsCTE()
+	{
+		$this->load->config('stv');
+		$tags = $this->config->item('tags');
+
+		$whereTags = '';
+		if (is_array($tags) && !isEmptyArray($tags))
+		{
+			$tags = array_keys($tags);
+
+			foreach ($tags as $key => $tag)
+			{
+				$tags[$key] = $this->db->escape($tag);
+			}
+
+			$whereTags = " AND tbl_notiz_typ.typ_kurzbz IN (" . implode(",", $tags) . ")";
+		}
+
+		return "tag_data_agg AS
+				(
+					SELECT
+						prestudent_id,
+						COALESCE(json_agg(tag ORDER BY done), '[]'::json) AS tags
+					FROM (
+							SELECT DISTINCT ON (public.tbl_notiz.notiz_id)
+								tbl_notiz.notiz_id AS id,
+								typ_kurzbz,
+								array_to_json(tbl_notiz_typ.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+								text AS notiz,
+								style,
+								erledigt AS done,
+								prestudent_id
+							FROM public.tbl_notizzuordnung
+								JOIN public.tbl_notiz ON tbl_notizzuordnung.notiz_id = tbl_notiz.notiz_id
+								JOIN public.tbl_notiz_typ ON tbl_notiz.typ = tbl_notiz_typ.typ_kurzbz
+							WHERE prestudent_id IN (SELECT prestudent_id FROM prestudenten)"
+			. $whereTags.
+			") AS tag
+					GROUP BY prestudent_id
+				)";
+	}
+
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 3d46dc32f..7de862a96 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -200,6 +200,9 @@ export default {
 						return Promise.resolve({ data: []});
 					}
 					return this.$api.call({url, params});
+					//version with Tags
+					return this.$api.call({url, params});
+
 				},
 				ajaxResponse: (url, params, response) => {
 					return response?.data;
@@ -238,7 +241,7 @@ export default {
 					event: 'rowClick',
 					handler: this.handleRowClick // TODO(chris): this should be in the filter component
 				},
-				{
+/*				{
 					event: 'dataTreeRowExpanded',
 					handler: (data) => {
 						this.getExpandedRows()
@@ -249,7 +252,7 @@ export default {
 					handler: (data) => {
 						this.getExpandedRows()
 					}
-				}
+				}*/
 			],
 			focusObj: null, // TODO(chris): this should be in the filter component
 			lastSelected: null,
@@ -278,7 +281,7 @@ export default {
 
 			//for tags
 			this.selectedRows = this.$refs.table.tabulator.getSelectedRows();
-			this.selectedColumnValues = this.selectedRows.filter(row => row.getData().uid !== undefined && row.getData().uid).map(row => row.getData().uid);
+			this.selectedColumnValues = this.selectedRows.filter(row => row.getData().prestudent_id !== undefined && row.getData().prestudent_id).map(row => row.getData().prestudent_id);
 
 			this.$emit('update:selected', data);
 		},
@@ -403,7 +406,6 @@ export default {
 		//methods tags
 		addedTag(addedTag)
 		{
-			console.log("addedTag");
 			const table = this.$refs.table.tabulator;
 
 			this.selectedRows.forEach(row =>
@@ -411,7 +413,7 @@ export default {
 				if (Array.isArray(addedTag.response))
 				{
 					addedTag.response.forEach(tag => {
-						const targetRow = this.allRows.find(row => row.getData().uid === tag.uid);
+						const targetRow = this.allRows.find(row => row.getData().prestudent_id === tag.prestudent_id);
 						if (targetRow)
 						{
 							const rowData = targetRow.getData();
@@ -434,7 +436,6 @@ export default {
 			});
 		},
 		deletedTag(deletedTag) {
-			console.log("deletedTag");
 			const targetRow = this.allRows.find(row => {
 				const rowData = row.getData();
 
@@ -467,7 +468,6 @@ export default {
 			}
 		},
 		updatedTag(updatedTag) {
-			console.log("updatedTag");
 			const targetRow = this.allRows.find(row => {
 				const rowData = row.getData();
 				let tags = [];
@@ -504,45 +504,6 @@ export default {
 				}
 			}
 		},
-		resetTree() {
-			console.log("reset tree");
-			this.allRows.forEach(row => {
-				row._row.modules.dataTree.open = false;
-			});
-
-			let rootRows = this.$refs.table.tabulator.getRows(true);
-			var lastRow = rootRows[rootRows.length - 1];
-			lastRow?.treeCollapse(true)
-
-			this.currentTreeLevel = 0;
-		},
-		expandTree()
-		{
-			console.log("expandTree");
-			this.currentTreeLevel = (this.currentTreeLevel || 0) + 1;
-
-			let lastMatchingRow = null;
-
-			this.allRows.forEach(row => {
-				const level = row._row.modules.dataTree?.index ?? 0;
-
-				if (level === this.currentTreeLevel - 1 )
-				{
-					row._row.modules.dataTree.open = true;
-
-					if (row._row.data._children?.length > 0)
-					{
-						lastMatchingRow = row;
-					}
-				}
-			});
-
-			if (lastMatchingRow)
-			{
-				lastMatchingRow.treeExpand();
-			}
-			this.$refs.table.tabulator.redraw();
-		},
 		getAllRows(rows)
 		{
 			let result = [];
@@ -557,16 +518,6 @@ export default {
 			});
 			return result;
 		},
-		async getExpandedRows() {
-			this.expanded = [];
-
-			this.allRows.forEach(row => {
-				if (row.getTreeChildren().length > 0 && row.isTreeExpanded())
-				{
-					this.expanded.push(row.getData().uniqueindex);
-				}
-			});
-		},
 		reexpandRows() {
 			this.allRows = this.getAllRows(this.$refs.table.tabulator.getRows());
 
@@ -605,7 +556,6 @@ export default {
 	// TODO(chris): filter component column chooser has no accessibilty features
 	template: `
 	<div class="stv-list h-100 pt-3">
-	test manu {{selectedColumnValues}}
 		<div class="tabulator-container d-flex flex-column h-100" :class="{'has-filter': filterKontoCount0 || filterKontoMissingCounter}" tabindex="0" @focusin="onFocus" @keydown="onKeydown">
 			<core-filter-cmpt
 				ref="table"
@@ -629,10 +579,8 @@ export default {
 					@added="addedTag"
 					@deleted="deletedTag"
 					@updated="updatedTag"
-					zuordnung_typ="uid"
+					zuordnung_typ="prestudent_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 #filter>

From 3a6c8dfd2d2d8669dda336b7e0a6762beebea374 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 8 Oct 2025 10:28:14 +0200
Subject: [PATCH 07/37] adapt event dataProcessed and method autoselect

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 7de862a96..3f7dc5057 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -223,9 +223,9 @@ export default {
 				},
 				{
 					event: 'dataProcessed',
-					//handler: this.autoSelectRows TODO(Manu) combine
 					handler: (data) => {
 						this.reexpandRows()
+						this.autoSelectRows()
 						this.$emit('update:selected', {})
 					}
 				},
@@ -241,7 +241,7 @@ export default {
 					event: 'rowClick',
 					handler: this.handleRowClick // TODO(chris): this should be in the filter component
 				},
-/*				{
+				{
 					event: 'dataTreeRowExpanded',
 					handler: (data) => {
 						this.getExpandedRows()
@@ -252,7 +252,7 @@ export default {
 					handler: (data) => {
 						this.getExpandedRows()
 					}
-				}*/
+				}
 			],
 			focusObj: null, // TODO(chris): this should be in the filter component
 			lastSelected: null,
@@ -286,7 +286,7 @@ export default {
 			this.$emit('update:selected', data);
 		},
 		autoSelectRows(data) {
-			if (this.lastSelected) {
+			if (Array.isArray(this.lastSelected) && this.lastSelected.length){
 				// NOTE(chris): reselect rows on refresh
 				let selected = this.lastSelected.map(el => this.$refs.table.tabulator.getRow(el.prestudent_id))
 				// TODO(chris): unselect current item if it's no longer in the table?

From 204ae1a4692921a52b447abfe87e66511540ab4b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 8 Oct 2025 16:34:39 +0200
Subject: [PATCH 08/37] refactor prepareQuery, use and take into account config
 parameters, refactor autoSelectRows

---
 application/config/stv.php                    |  14 +-
 .../api/frontend/v1/stv/Students.php          |  59 +++++--
 .../controllers/api/frontend/v1/stv/Tags.php  |  31 +---
 application/models/crm/Prestudent_model.php   | 166 ------------------
 .../Stv/Studentenverwaltung/List.js           |   2 +-
 5 files changed, 53 insertions(+), 219 deletions(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index d9519bd6e..3798cc702 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -115,8 +115,14 @@ $config['students_tab_order'] = [
 ];
 
 $config['stv_prestudent_tags'] = [
-	'tag_1' => ['readonly' => false],
-	'tag_2' => ['readonly' => true],
-	'tag_3' => ['readonly' => false],
-	'tag_4' => ['readonly' => true]
+	'prioone' => ['readonly' => false],
+	'priotwo' => ['readonly' => true],
+	'hinweis' => ['readonly' => false],
+	'hinweis_assistenz' => ['readonly' => true],
+	'hinweis_kf' => ['readonly' => true],
+	'hinweis_lehrende' => ['readonly' => false],
+	'hinweis_stg_kf' => ['readonly' => true],
+	'finished_stg' => ['readonly' => true],
+	'finished_kf' => ['readonly' => true],
+	'inwork_kf' => ['readonly' => true],
 ];
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index b9f869ac3..06dc91083 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -430,7 +430,7 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function fetchStudentsWithoutTagsPrestudent($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');
@@ -517,24 +517,7 @@ class Students extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($data);
 	}
-
-	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');
-
-		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
-		{
-			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
-		}
-		$allowedStg = $this->allowedStgs;
-		$result = $this->PrestudentModel->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $allowedStg, $semester, $verband, $gruppe, $gruppe_kurzbz, $orgform_kurzbz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-
+	
 	/**
 	 * @param string		$prestudent_id
 	 *
@@ -748,6 +731,41 @@ class Students extends FHCAPI_Controller
 	{
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
+		$this->load->config('stv');
+		$tags = $this->config->item('stv_prestudent_tags');
+
+		$whereTags = '';
+		if (is_array($tags) && !isEmptyArray($tags)) {
+			$tags = array_keys($tags);
+
+			foreach ($tags as $key => $tag) {
+				$tags[$key] = $this->db->escape($tag);
+			}
+			$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+		}
+		$subQueryTag = "
+		  (
+			SELECT
+			  tag.prestudent_id,
+			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+			FROM (
+			  SELECT DISTINCT ON (n.notiz_id)
+				n.notiz_id AS id,
+				nt.typ_kurzbz,
+				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+				n.text AS notiz,
+				nt.style,
+				n.erledigt AS done,
+				nz.prestudent_id
+			  FROM public.tbl_notizzuordnung AS nz
+				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
+			. $whereTags .
+			"
+			) AS tag
+			GROUP BY tag.prestudent_id
+		  ) AS tag_data_agg
+		";
 
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -770,8 +788,11 @@ class Students extends FHCAPI_Controller
 			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->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+
 
 		$this->PrestudentModel->addSelect("b.uid");
+		$this->PrestudentModel->addSelect('tag_data_agg.tags');
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');
diff --git a/application/controllers/api/frontend/v1/stv/Tags.php b/application/controllers/api/frontend/v1/stv/Tags.php
index 397b2abbe..154e57ba7 100644
--- a/application/controllers/api/frontend/v1/stv/Tags.php
+++ b/application/controllers/api/frontend/v1/stv/Tags.php
@@ -21,34 +21,7 @@ class Tags extends Tag_Controller
 			'deleteLehre' => self::BERECHTIGUNG_KURZBZ,*/
 		]);
 
-		$this->config->load('lvverwaltung');
-	}
-	public function getTag($readonly_tags = null)
-	{
-		parent::getTag($this->config->item('lvverwaltung_tags'));
-	}
-	public function getTags($tags = null)
-	{
-		parent::getTags($this->config->item('lvverwaltung_tags'));
-	}
-	public function addTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::addTag(true, $this->config->item('lvverwaltung_tags'));
-	}
-	public function updateTag($updatable_tags = null)
-	{
-		parent::updateTag($this->config->item('lvverwaltung_tags'));
-	}
-	public function deleteTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::deleteTag(true, $this->config->item('lvverwaltung_tags'));
-	}
-	public function doneTag($updatable_tags = null)
-	{
-		parent::doneTag($this->config->item('lvverwaltung_tags'));
-	}
-
-	/*$this->config->load('stv');
+	$this->config->load('stv');
 	}
 
 	public function getTag($readonly_tags = null)
@@ -76,5 +49,5 @@ class Tags extends Tag_Controller
 	public function doneTag($updatable_tags = null)
 	{
 		parent::doneTag($this->config->item('stv_prestudent_tags'));
-	}*/
+	}
 }
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index bd552d0c3..ff56c3268 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -782,170 +782,4 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
-
-	/**
-	 * Version in raw sql to fetch Students for loading StudentList
-	 * @param integer $studiengang_kz
-	 * @param string $studiensemester_kurzbz
-	 * @param Array $allowedStg
-	 * @param integer $semester (optional)
-	 * @param string $verband (optional)
-	 * @param integer $gruppe (optional)
-	 * @param string $gruppe_kurzbz (optional)
-	 * @param string $orgform_kurzbz (optional)
-	 *
-	 * @return object
-	 */
-	public function fetchStudents($studiensemester_kurzbz, $studiengang_kz, $allowedStg, $semester, $verband, $gruppe, $gruppe_kurzbz, $orgform_kurzbz)
-	{
-
-		$stdsemEsc = $studiensemester_kurzbz ? $this->db->escape($studiensemester_kurzbz) : 'NULL';
-		$orgform_kurzbzEsc = $orgform_kurzbz ? $this->db->escape($orgform_kurzbz) : 'NULL';
-
-		$qry = "WITH prestudenten AS (
-					SELECT *
-					FROM public.tbl_prestudent
-							),
-			". $this->getTagsCTE() . "
-			SELECT b.uid,
-			  COALESCE(tag_data_agg.tags, '[]'::json) AS tags,
-			titelpre, nachname, vorname, wahlname, vornamen, titelpost, ersatzkennzeichen, gebdatum, geschlecht, foto, foto_sperre,
-			UPPER(stg.typ || stg.kurzbz) AS studiengang, tbl_prestudent.studiengang_kz, stg.bezeichnung AS stg_bezeichnung, s.matrikelnr,
-			p.person_id, pls.status_kurzbz AS status, pls.datum AS status_datum, pls.bestaetigtam AS status_bestaetigung,
-			(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat,
-			CASE
-				WHEN b.uid IS NOT NULL AND b.uid<>''
-				THEN CONCAT(b.uid, '@', " . $this->db->escape(DOMAIN) .")
-				ELSE ''
-			END AS mail_intern, p.anmerkung AS anmerkungen, tbl_prestudent.anmerkung, pls.orgform_kurzbz, aufmerksamdurch_kurzbz,
-			(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte,
-			tbl_prestudent.aufnahmegruppe_kurzbz, tbl_prestudent.dual, p.matr_nr, sp.bezeichnung AS studienplan_bezeichnung,
-			tbl_prestudent.prestudent_id, mentor, b.aktiv AS bnaktiv, v.semester, v.verband, v.gruppe, '' AS priorisierung_relativ,
-			(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = ?
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester
-				FROM public.tbl_prestudent
-				LEFT JOIN public.tbl_studiengang stg USING (studiengang_kz)
-				JOIN public.tbl_person p USING (person_id)
-				JOIN public.tbl_student s USING (prestudent_id)
-				LEFT JOIN public.tbl_prestudentstatus pls ON 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 JOIN lehre.tbl_studienplan sp USING (studienplan_id)
-				LEFT JOIN public.tbl_benutzer b ON s.student_uid=b.uid
-				JOIN public.tbl_studentlehrverband v ON v.student_uid=s.student_uid ";
-
-				$qry .= $studiensemester_kurzbz ? ' AND v.studiensemester_kurzbz = ' . $this->db->escape($studiensemester_kurzbz) : ' AND v.studiensemester_kurzbz =  IS NULL';
-
-				if($gruppe_kurzbz !== null)
-				{
-					$qry .= " JOIN public.tbl_benutzergruppe g USING (uid)";
-				}
-
-				$qry .= "
-				LEFT JOIN public.tbl_prestudentstatus ps ON ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ?)
-				AND ps.prestudent_id = tbl_prestudent.prestudent_id
-				AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ?)
-				AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ?)
-				LEFT JOIN tag_data_agg ON tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id
-				WHERE tbl_prestudent.studiengang_kz IN ?";
-
-				$params = array($stdsemEsc, $stdsemEsc, $stdsemEsc, $stdsemEsc, $allowedStg);
-
-				if (!$verband && !$gruppe && $orgform_kurzbz !== null)
-				{
-					$qry .= "
-					AND (
-						SELECT orgform_kurzbz
-						FROM public.tbl_prestudentstatus
-						WHERE prestudent_id=tbl_prestudent.prestudent_id
-						AND studiensemester_kurzbz=" . $stdsemEsc . "
-						ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
-					) =  " . $orgform_kurzbzEsc ;
-				}
-
-				if($semester !== null)
-				{
-					$qry .= " AND v.semester = ?";
-					$params[] = $semester;
-				}
-				if($verband !== null)
-				{
-					$qry .= " AND v.verband = ?";
-					$params[] = $verband;
-				}
-
-				if($gruppe !== null)
-				{
-					$qry .= " AND v.gruppe = ?";
-					$params[] = $gruppe;
-				}
-
-				if($gruppe_kurzbz !== null)
-				{
-					$qry .= " AND g.gruppe_kurzbz = ?";
-					$qry .= " AND g.studiensemester_kurzbz = ?";
-					$params[] = $gruppe_kurzbz;
-					$params[] = $stdsemEsc;
-				}
-				else
-				{
-					$qry .= " AND v.studiengang_kz = ?";
-					$params[] = $studiengang_kz;
-				}
-
-				$qry .= "
-					ORDER BY nachname ASC, vorname ASC
-				";
-		return $this->execReadOnlyQuery($qry, $params);
-	}
-
-	public function getTagsCTE()
-	{
-		$this->load->config('stv');
-		$tags = $this->config->item('tags');
-
-		$whereTags = '';
-		if (is_array($tags) && !isEmptyArray($tags))
-		{
-			$tags = array_keys($tags);
-
-			foreach ($tags as $key => $tag)
-			{
-				$tags[$key] = $this->db->escape($tag);
-			}
-
-			$whereTags = " AND tbl_notiz_typ.typ_kurzbz IN (" . implode(",", $tags) . ")";
-		}
-
-		return "tag_data_agg AS
-				(
-					SELECT
-						prestudent_id,
-						COALESCE(json_agg(tag ORDER BY done), '[]'::json) AS tags
-					FROM (
-							SELECT DISTINCT ON (public.tbl_notiz.notiz_id)
-								tbl_notiz.notiz_id AS id,
-								typ_kurzbz,
-								array_to_json(tbl_notiz_typ.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-								text AS notiz,
-								style,
-								erledigt AS done,
-								prestudent_id
-							FROM public.tbl_notizzuordnung
-								JOIN public.tbl_notiz ON tbl_notizzuordnung.notiz_id = tbl_notiz.notiz_id
-								JOIN public.tbl_notiz_typ ON tbl_notiz.typ = tbl_notiz_typ.typ_kurzbz
-							WHERE prestudent_id IN (SELECT prestudent_id FROM prestudenten)"
-			. $whereTags.
-			") AS tag
-					GROUP BY prestudent_id
-				)";
-	}
-
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 3f7dc5057..071bf4206 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -295,7 +295,7 @@ export default {
 
 				if (selected.length)
 					this.$refs.table.tabulator.selectRow(selected);
-			} else if(this.lastSelected === undefined) {
+			} else if(data && this.lastSelected === undefined) {
 				// NOTE(chris): select row if it's the only one (preferably only on startup)
 				if (data.length == 1) {
 					this.$refs.table.tabulator.selectRow(this.$refs.table.tabulator.getRows());

From c7f2b145bf78b69102f25a3481a2c54fd5bd17ef Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 10 Oct 2025 14:15:40 +0200
Subject: [PATCH 09/37] add checkBerechtigungen for Notes person_id and notes
 prestudent_id

---
 .../api/frontend/v1/notiz/NotizPerson.php     | 105 ++++++++++++++++--
 .../api/frontend/v1/notiz/NotizPrestudent.php |  75 ++++++++++++-
 .../api/frontend/v1/stv/Students.php          |   2 +-
 .../controllers/api/frontend/v1/stv/Tags.php  |   7 +-
 4 files changed, 174 insertions(+), 15 deletions(-)

diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index 8fd63b83c..7f0645bc6 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -20,6 +20,66 @@ class NotizPerson extends Notiz_Controller
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
 			'getCountNotes' => ['admin:r', 'assistenz:r'],
 		]);
+
+		//Load Models
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+
+		//Permission checks for allowed Oes
+		if ($this->router->method == 'addNewNotiz')
+		{
+			$json = $this->input->post('data');
+			$post_data = json_decode($json, true);
+			$person_id = $post_data['id'];
+
+			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
+
+			if(!$person_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+		}
+
+		if ( $this->router->method == 'updateNotiz')
+		{
+			$json = $this->input->post('data');
+			$post_data = json_decode($json, true);
+			$notiz_id = $post_data['notiz_id'];
+
+			if(!$notiz_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
+			}
+
+			//get person_id
+			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
+
+			$data = $this->getDataOrTerminateWithError($result);
+			$person_id = current($data)->person_id;
+
+			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
+			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+		}
+
+		if ($this->router->method == 'deleteNotiz' )
+		{
+			$notiz_id = $this->input->post('notiz_id');
+			$person_id = $this->input->post('id');
+
+			if(!$notiz_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
+			}
+
+			if(!$person_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'person ID']), self::ERROR_TYPE_GENERAL);
+			}
+
+			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
+			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+		}
 	}
 
 	public function isBerechtigt($id, $typeId)
@@ -29,7 +89,6 @@ class NotizPerson extends Notiz_Controller
 			$this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
-		//TODO define permission
 		if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
 		{
 			$result =  $this->p->t('lehre', 'error_keineSchreibrechte');
@@ -39,13 +98,45 @@ class NotizPerson extends Notiz_Controller
 		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 
-	public function loadDokumente()
+	//stv: if person has permission of one studiengang of person -> permission to add/update/delete Note
+	private function _checkIfBerechtigungForOneUidExists($person_id, $allowedStgs)
 	{
-		$notiz_id = $this->input->post('notiz_id');
+		//get all studentUids of person_id
+		$result = $this->BenutzerModel->loadWhere(['person_id' => $person_id]);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		// TODO(chris): make CI variant of endpoint
-		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || campus.tbl_dms_version.dms_id AS preview');
-		
-		return parent::loadDokumente();
+		$checkarray = [];
+		foreach ($data as $item)
+		{
+			//check if isStudent
+			$result = $this->StudentModel->isStudent($item->uid);
+
+			$isStudent = $this->getDataOrTerminateWithError($result);
+			if($isStudent)
+			{
+				$checkarray[]  = $this->_checkAllowedStgsFromUid($item->uid, $allowedStgs);
+			}
+
+		}
+		if (!in_array(1, $checkarray))
+			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
+	}
+
+	private function _checkAllowedStgsFromUid($student_uid, $allowedStgs)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->loadWhere(['student_uid' => $student_uid]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$studiengang_kz = current($data)->studiengang_kz;
+
+		if (!in_array($studiengang_kz, $allowedStgs))
+		{
+			return 0;
+		}
+		else
+		{
+			return 1;
+		}
 	}
 }
diff --git a/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php b/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php
index fc601770d..5e6cd747c 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPrestudent.php
@@ -15,6 +15,7 @@ class NotizPrestudent extends Notiz_Controller
 		//Load Models
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -23,6 +24,63 @@ class NotizPrestudent extends Notiz_Controller
 		$this->loadPhrases([
 			'ui'
 		]);
+
+		//Permission checks for Studiengangsarray
+		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
+
+		if ($this->router->method == 'addNewNotiz')
+		{
+			$json = $this->input->post('data');
+			$post_data = json_decode($json, true);
+			$prestudent_id = $post_data['id'];
+
+			if(!$prestudent_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
+		}
+
+		if ($this->router->method == 'updateNotiz')
+		{
+			$json = $this->input->post('data');
+			$post_data = json_decode($json, true);
+			$notiz_id = $post_data['notiz_id'];
+
+			if(!$notiz_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
+			}
+
+			//get prestudent_id
+			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
+
+			$data = $this->getDataOrTerminateWithError($result);
+			$prestudent_id = current($data)->prestudent_id;
+
+			if(!$prestudent_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
+		}
+
+		if ($this->router->method == 'deleteNotiz')
+		{
+			$notiz_id = $this->input->post('notiz_id');
+			$prestudent_id = $this->input->post('id');
+
+			if(!$notiz_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
+			}
+
+			if(!$prestudent_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
+		}
 	}
 
 	public function isBerechtigt($id, $typeId)
@@ -32,7 +90,6 @@ class NotizPrestudent extends Notiz_Controller
 			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
-		//TODO define permission
 		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
 		{
 			$result =  $this->p->t('lehre','error_keineSchreibrechte');
@@ -41,4 +98,20 @@ class NotizPrestudent extends Notiz_Controller
 		}
 		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
+
+	private function _checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs)
+	{
+		$student_uid = $this->StudentModel->getUID($prestudent_id);
+
+		$result = $this->StudentModel->loadWhere(['student_uid' => $student_uid]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$studiengang_kz = current($data)->studiengang_kz;
+
+		if (!in_array($studiengang_kz, $allowedStgs))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 06dc91083..2ede61350 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -517,7 +517,7 @@ class Students extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($data);
 	}
-	
+
 	/**
 	 * @param string		$prestudent_id
 	 *
diff --git a/application/controllers/api/frontend/v1/stv/Tags.php b/application/controllers/api/frontend/v1/stv/Tags.php
index 154e57ba7..3004a1f3b 100644
--- a/application/controllers/api/frontend/v1/stv/Tags.php
+++ b/application/controllers/api/frontend/v1/stv/Tags.php
@@ -15,10 +15,7 @@ class Tags extends Tag_Controller
 			'addTag' => self::BERECHTIGUNG_KURZBZ,
 			'updateTag' => self::BERECHTIGUNG_KURZBZ,
 			'doneTag' => self::BERECHTIGUNG_KURZBZ,
-			'deleteTag' => self::BERECHTIGUNG_KURZBZ,
-/*			'updateLehre' => self::BERECHTIGUNG_KURZBZ,
-			'doneLehre' => self::BERECHTIGUNG_KURZBZ,
-			'deleteLehre' => self::BERECHTIGUNG_KURZBZ,*/
+			'deleteTag' => self::BERECHTIGUNG_KURZBZ
 		]);
 
 	$this->config->load('stv');
@@ -26,12 +23,10 @@ class Tags extends Tag_Controller
 
 	public function getTag($readonly_tags = null)
 	{
-	//	console.log("in this endpoint. getTags");
 		parent::getTag($this->config->item('stv_prestudent_tags'));
 	}
 	public function getTags($tags = null)
 	{
-	//	$this->terminateWithError(" IN TAGS.PHP ", self::ERROR_TYPE_GENERAL);
 		parent::getTags($this->config->item('stv_prestudent_tags'));
 	}
 	public function addTag($withZuordnung = true, $updatable_tags = null)

From 96be1789b5f09c5b7aed5255069ff4460eb49dc6 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 27 Nov 2025 09:45:57 +0100
Subject: [PATCH 10/37] tag-formatter & helper hinzugefuegt

---
 .../js/components/LVVerwaltung/Setup/Table.js | 171 +--------------
 .../Stv/Studentenverwaltung/List.js           | 207 ++----------------
 public/js/helpers/TagHelper.js                | 124 +++++++++++
 public/js/tabulator/formatter/tags.js         |  67 ++++++
 4 files changed, 214 insertions(+), 355 deletions(-)
 create mode 100644 public/js/helpers/TagHelper.js
 create mode 100644 public/js/tabulator/formatter/tags.js

diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 830cfc9ea..67c63c3bb 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -4,6 +4,8 @@ import DetailsForm from "../Details/Form.js";
 import CoreTag from '../../Tag/Tag.js';
 import { tagHeaderFilter } from '../../../../js/tabulator/filters/extendedHeaderFilter.js';
 import { extendedHeaderFilter } from "../../../../js/tabulator/filters/extendedHeaderFilter.js";
+import { tagFormatter } from "../../../../js/tabulator/formatter/tags.js";
+import { addTagInTable, deleteTagInTable, updateTagInTable } from "../../../../js/helpers/TagHelper.js";
 
 import ApiLv from "../../../api/lehrveranstaltung.js";
 import ApiTag from "../../../api/lehrveranstaltung/tag.js";
@@ -223,72 +225,7 @@ export default {
 						headerFilter: "input",
 						headerFilterFunc: tagHeaderFilter,
 						headerFilterFuncParams: {field: 'tags'},
-						formatter: (cell) => {
-							let tags = cell.getValue();
-							if (!tags) return;
-
-							let container = document.createElement('div');
-							container.className = "d-flex gap-1";
-
-							let parsedTags = JSON.parse(tags);
-							let maxVisibleTags = 2;
-
-							const rowData = cell.getRow().getData();
-							if (rowData._tagExpanded === undefined) {
-								rowData._tagExpanded = false;
-							}
-
-							const renderTags = () => {
-								container.innerHTML = '';
-								parsedTags = parsedTags.filter(item => item !== null);
-
-								parsedTags.sort((a, b) => {
-									let adone = a.done ? 1 : 0;
-									let bbone = b.done ? 1 : 0;
-
-									if (adone !== bbone)
-									{
-										return adone - bbone;
-									}
-									return b.id - a.id;
-								});
-								const tagsToShow = rowData._tagExpanded ? parsedTags : parsedTags.slice(0, maxVisibleTags);
-
-								tagsToShow.forEach(tag => {
-									if (!tag) return;
-									let tagElement = document.createElement('span');
-									tagElement.innerText = tag.beschreibung;
-									tagElement.title = tag.notiz;
-									tagElement.className = "tag " + tag.style;
-									if (tag.done) tagElement.className += " tag_done";
-
-									tagElement.addEventListener('click', (event) => {
-										event.stopPropagation();
-										event.preventDefault();
-										this.$refs.tagComponent.editTag(tag.id);
-									});
-
-									container.appendChild(tagElement);
-								});
-
-								if (parsedTags.length > maxVisibleTags) {
-									let toggle = document.createElement('button');
-									toggle.innerText = (rowData._tagExpanded ? '- ' : '+ ') + (parsedTags.length - maxVisibleTags);
-									toggle.className = "display_all";
-									toggle.title = rowData._tagExpanded ? "Tags ausblenden" : "Tags einblenden";
-
-									toggle.addEventListener('click', () => {
-										rowData._tagExpanded = !rowData._tagExpanded;
-										renderTags();
-									});
-
-									container.appendChild(toggle);
-								}
-							};
-
-							renderTags();
-							return container;
-						},
+						formatter: (cell) => tagFormatter(cell, this.$refs.tagComponent),
 						width: 150,
 					},
 					{
@@ -444,104 +381,16 @@ export default {
 		},
 		addedTag(addedTag)
 		{
-			const table = this.$refs.table.tabulator;
-
-			this.selectedRows.forEach(row =>
-			{
-				if (Array.isArray(addedTag.response))
-				{
-					addedTag.response.forEach(tag => {
-						const targetRow = this.allRows.find(row => row.getData().lehreinheit_id === tag.lehreinheit_id);
-						if (targetRow)
-						{
-							const rowData = targetRow.getData();
-							let tags = [];
-							try {
-								tags = JSON.parse(rowData.tags || '[]');
-							} catch (e) {}
-
-							const tagExists = tags.some((t) => t.id === tag.id);
-							if (!tagExists)
-							{
-								addedTag.id = tag.id;
-								tags.unshift({ ...addedTag });
-								targetRow.update({ tags: JSON.stringify(tags) });
-								targetRow.reformat();
-							}
-						}
-					});
-				}
-			});
+			addTagInTable(addedTag, this.allRows, 'lehreinheit_id')
 		},
-		deletedTag(deletedTag) {
-			const targetRow = this.allRows.find(row => {
-				const rowData = row.getData();
-
-				let tags = [];
-				try {
-					tags = JSON.parse(rowData.tags || '[]');
-				} catch (e) {}
-
-				return tags.some(tag => tag.id === deletedTag);
-			});
-
-			if (targetRow) {
-				const rowData = targetRow.getData();
-				let tags = [];
-
-				try {
-					tags = JSON.parse(rowData.tags || '[]');
-				} catch (e) {}
-
-				const filteredTags = tags.filter(t => t.id !== deletedTag);
-				const updatedTags = JSON.stringify(filteredTags);
-
-				if (updatedTags !== rowData.tags) {
-					targetRow.update({
-						tags: updatedTags
-					});
-
-					targetRow.reformat();
-				}
-			}
+		deletedTag(deletedTag)
+		{
+			deleteTagInTable(deletedTag, this.allRows);
 		},
 
-		updatedTag(updatedTag) {
-			const targetRow = this.allRows.find(row => {
-				const rowData = row.getData();
-				let tags = [];
-
-				try {
-					tags = JSON.parse(rowData.tags || '[]');
-				} catch (e) {}
-
-				return tags.some(t => t?.id === updatedTag.id);
-			});
-
-			if (targetRow)
-			{
-				const rowData = targetRow.getData();
-				let tags = [];
-				try {
-					tags = JSON.parse(rowData.tags || '[]');
-				} catch (e) {}
-
-				let changed = false;
-
-				const tagIndex = tags.findIndex(tag => tag?.id === updatedTag.id);
-				if (tagIndex !== -1) {
-					tags[tagIndex] = { ...updatedTag };
-					changed = true;
-				}
-
-				if (changed)
-				{
-					targetRow.update({
-						tags: JSON.stringify(tags),
-					});
-					targetRow.reformat();
-				}
-			}
+		updatedTag(updatedTag)
+		{
+			updateTagInTable(updatedTag, this.allRows);
 		},
 		async copyLehreinheit(row, art)
 		{
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 6f06787a1..0ba1cd5ee 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../filter/Filter.js";
 import ListNew from './List/New.js';
 import CoreTag from '../../Tag/Tag.js';
 import { tagHeaderFilter } from "../../../tabulator/filters/extendedHeaderFilter.js";
+import { addTagInTable, deleteTagInTable, updateTagInTable } from "../../../../js/helpers/TagHandler.js";
+import { tagFormatter } from "../../../../js/tabulator/formatter/tags.js";
 import { extendedHeaderFilter } from "../../../tabulator/filters/extendedHeaderFilter.js";
 import ApiTag from "../../../api/factory/stv/tag.js";
 import ListFilter from './List/Filter.js';
@@ -67,72 +69,7 @@ export default {
 						headerFilter: "input",
 						headerFilterFunc: tagHeaderFilter,
 						headerFilterFuncParams: {field: 'tags'},
-						formatter: (cell) => {
-							let tags = cell.getValue();
-							if (!tags) return;
-
-							let container = document.createElement('div');
-							container.className = "d-flex gap-1";
-
-							let parsedTags = JSON.parse(tags);
-							let maxVisibleTags = 2;
-
-							const rowData = cell.getRow().getData();
-							if (rowData._tagExpanded === undefined) {
-								rowData._tagExpanded = false;
-							}
-
-							const renderTags = () => {
-								container.innerHTML = '';
-								parsedTags = parsedTags.filter(item => item !== null);
-
-								parsedTags.sort((a, b) => {
-									let adone = a.done ? 1 : 0;
-									let bbone = b.done ? 1 : 0;
-
-									if (adone !== bbone)
-									{
-										return adone - bbone;
-									}
-									return b.id - a.id;
-								});
-								const tagsToShow = rowData._tagExpanded ? parsedTags : parsedTags.slice(0, maxVisibleTags);
-
-								tagsToShow.forEach(tag => {
-									if (!tag) return;
-									let tagElement = document.createElement('span');
-									tagElement.innerText = tag.beschreibung;
-									tagElement.title = tag.notiz;
-									tagElement.className = "tag " + tag.style;
-									if (tag.done) tagElement.className += " tag_done";
-
-									tagElement.addEventListener('click', (event) => {
-										event.stopPropagation();
-										event.preventDefault();
-										this.$refs.tagComponent.editTag(tag.id);
-									});
-
-									container.appendChild(tagElement);
-								});
-
-								if (parsedTags.length > maxVisibleTags) {
-									let toggle = document.createElement('button');
-									toggle.innerText = (rowData._tagExpanded ? '- ' : '+ ') + (parsedTags.length - maxVisibleTags);
-									toggle.className = "display_all";
-									toggle.title = rowData._tagExpanded ? "Tags ausblenden" : "Tags einblenden";
-
-									toggle.addEventListener('click', () => {
-										rowData._tagExpanded = !rowData._tagExpanded;
-										renderTags();
-									});
-
-									container.appendChild(toggle);
-								}
-							};
-
-							renderTags();
-							return container;
-						},
+						formatter: (cell) => tagFormatter(cell, this.$refs.tagComponent),
 						width: 150,
 					},
 					{title:"Nachname", field:"nachname", headerFilter: true},
@@ -235,7 +172,7 @@ export default {
 				{
 					event: 'dataProcessed',
 					handler: (data) => {
-						this.reexpandRows()
+						this.getAllRows()
 						this.autoSelectRows(data)
 					}
 				},
@@ -481,136 +418,18 @@ export default {
 		//methods tags
 		addedTag(addedTag)
 		{
-			const table = this.$refs.table.tabulator;
-
-			this.selectedRows.forEach(row =>
-			{
-				if (Array.isArray(addedTag.response))
-				{
-					addedTag.response.forEach(tag => {
-						const targetRow = this.allRows.find(row => row.getData().prestudent_id === tag.prestudent_id);
-						if (targetRow)
-						{
-							const rowData = targetRow.getData();
-							let tags = [];
-							try {
-								tags = JSON.parse(rowData.tags || '[]');
-							} catch (e) {}
-
-							const tagExists = tags.some((t) => t.id === tag.id);
-							if (!tagExists)
-							{
-								addedTag.id = tag.id;
-								tags.unshift({ ...addedTag });
-								targetRow.update({ tags: JSON.stringify(tags) });
-								targetRow.reformat();
-							}
-						}
-					});
-				}
-			});
+			addTagInTable(addedTag, this.allRows, 'prestudent_id')
 		},
-		deletedTag(deletedTag) {
-			const targetRow = this.allRows.find(row => {
-				const rowData = row.getData();
-
-				let tags = [];
-				try {
-					tags = JSON.parse(rowData.tags || '[]');
-				} catch (e) {}
-
-				return tags.some(tag => tag.id === deletedTag);
-			});
-
-			if (targetRow) {
-				const rowData = targetRow.getData();
-				let tags = [];
-
-				try {
-					tags = JSON.parse(rowData.tags || '[]');
-				} catch (e) {}
-
-				const filteredTags = tags.filter(t => t.id !== deletedTag);
-				const updatedTags = JSON.stringify(filteredTags);
-
-				if (updatedTags !== rowData.tags) {
-					targetRow.update({
-						tags: updatedTags
-					});
-
-					targetRow.reformat();
-				}
-			}
-		},
-		updatedTag(updatedTag) {
-			const targetRow = this.allRows.find(row => {
-				const rowData = row.getData();
-				let tags = [];
-
-				try {
-					tags = JSON.parse(rowData.tags || '[]');
-				} catch (e) {}
-
-				return tags.some(t => t?.id === updatedTag.id);
-			});
-
-			if (targetRow)
-			{
-				const rowData = targetRow.getData();
-				let tags = [];
-				try {
-					tags = JSON.parse(rowData.tags || '[]');
-				} catch (e) {}
-
-				let changed = false;
-
-				const tagIndex = tags.findIndex(tag => tag?.id === updatedTag.id);
-				if (tagIndex !== -1) {
-					tags[tagIndex] = { ...updatedTag };
-					changed = true;
-				}
-
-				if (changed)
-				{
-					targetRow.update({
-						tags: JSON.stringify(tags),
-					});
-					targetRow.reformat();
-				}
-			}
-		},
-		getAllRows(rows)
+		deletedTag(deletedTag)
 		{
-			let result = [];
-			rows.forEach(row =>
-			{
-				result.push(row);
-				let children = row.getTreeChildren();
-				if(children && children.length > 0)
-				{
-					result = result.concat(this.getAllRows(children));
-				}
-			});
-			return result;
+			deleteTagInTable(deletedTag, this.allRows);
 		},
-		reexpandRows() {
-			this.allRows = this.getAllRows(this.$refs.table.tabulator.getRows());
-
-			const matchingRows = this.allRows.filter(row =>
-				this.expanded.includes(row.getData().uniqueindex)
-			);
-
-			if (matchingRows.length === 0)
-				this.currentTreeLevel = 0;
-
-			matchingRows.forEach((row, index) => {
-				row._row.modules.dataTree.open = true;
-
-				if (index === matchingRows.length - 1)
-				{
-					row.treeExpand();
-				}
-			});
+		updatedTag(updatedTag)
+		{
+			updateTagInTable(updatedTag, this.allRows)
+		},
+		getAllRows() {
+			this.allRows = this.$refs.table.tabulator.getRows();
 		},
 
 	},
diff --git a/public/js/helpers/TagHelper.js b/public/js/helpers/TagHelper.js
new file mode 100644
index 000000000..9282aa167
--- /dev/null
+++ b/public/js/helpers/TagHelper.js
@@ -0,0 +1,124 @@
+export function addTagInTable(addedTag, rows, matchKey, tagsKey = "tags")
+{
+	if (!addedTag || !Array.isArray(addedTag.response))
+		return;
+
+	rows.forEach(row =>
+	{
+		const rowData = row.getData();
+		let updated = false;
+
+		addedTag.response.forEach(tag =>
+		{
+			if (rowData[matchKey] !== tag[matchKey])
+				return;
+
+			let tags;
+			try {
+				tags = JSON.parse(rowData[tagsKey] || "[]");
+			} catch (e) {
+				tags = [];
+			}
+
+			if (!Array.isArray(tags))
+				tags = [];
+
+			if (tags.some(t => t?.id === tag.id))
+				return;
+
+			let newTag = { ...addedTag, id: tag.id };
+
+			tags.unshift(newTag);
+
+			rowData[tagsKey] = JSON.stringify(tags);
+			updated = true;
+		});
+
+		if (updated)
+			row.update(rowData);
+	});
+}
+
+export function deleteTagInTable(deletedTag, rows, tagsKeys = ['tags'])
+{
+	if (!Array.isArray(tagsKeys))
+		tagsKeys = [tagsKeys];
+
+	rows.forEach(row => {
+		let rowData = row.getData();
+		let updates = {};
+		let changed = false;
+
+		tagsKeys.forEach(key => {
+			let tags;
+
+			try {
+				tags = JSON.parse(rowData[key] || "[]");
+			} catch (e) {
+				tags = [];
+			}
+
+			if (!Array.isArray(tags))
+				return;
+
+			let filtered = tags.filter(tag => tag?.id !== deletedTag);
+
+			if (filtered.length !== tags.length)
+			{
+				updates[key] = JSON.stringify(filtered);
+				changed = true;
+			}
+		});
+
+		if (changed) {
+			row.update(updates);
+			row.reformat();
+		}
+	});
+}
+
+
+export function updateTagInTable(updatedTag, rows, fields = ['tags'])
+{
+	if (!Array.isArray(fields))
+		fields = [fields];
+
+	rows.forEach(row =>
+	{
+		const rowData = row.getData();
+		let updated = false;
+
+		fields.forEach(field =>
+		{
+			if (!rowData[field])
+				return;
+
+			let fieldData;
+			try {
+				fieldData = JSON.parse(rowData[field] || "[]");
+			} catch (e) {
+				return;
+			}
+
+			if (!Array.isArray(fieldData))
+				return;
+
+			let index = fieldData.findIndex(tag => tag?.id === updatedTag.id);
+
+			if (index !== -1)
+			{
+				fieldData[index] = { ...updatedTag };
+				let updatedFieldData = JSON.stringify(fieldData);
+
+				if (updatedFieldData !== rowData[field])
+				{
+					rowData[field] = updatedFieldData;
+					updated = true;
+				}
+			}
+		});
+
+		if (updated)
+			row.update(rowData);
+	});
+}
diff --git a/public/js/tabulator/formatter/tags.js b/public/js/tabulator/formatter/tags.js
new file mode 100644
index 000000000..0d2f5004c
--- /dev/null
+++ b/public/js/tabulator/formatter/tags.js
@@ -0,0 +1,67 @@
+export function tagFormatter(cell, tagComponent)
+{
+	let tags = cell.getValue();
+	if (!tags) return;
+
+	let container = document.createElement('div');
+	container.className = "d-flex gap-1";
+
+	let parsedTags = JSON.parse(tags);
+	let maxVisibleTags = 2;
+
+	const rowData = cell.getRow().getData();
+	if (rowData._tagExpanded === undefined) {
+		rowData._tagExpanded = false;
+	}
+
+	const renderTags = () => {
+		container.innerHTML = '';
+		parsedTags = parsedTags.filter(item => item !== null);
+
+		parsedTags.sort((a, b) => {
+			let adone = a.done ? 1 : 0;
+			let bbone = b.done ? 1 : 0;
+
+			if (adone !== bbone)
+			{
+				return adone - bbone;
+			}
+			return b.id - a.id;
+		});
+		const tagsToShow = rowData._tagExpanded ? parsedTags : parsedTags.slice(0, maxVisibleTags);
+
+		tagsToShow.forEach(tag => {
+			if (!tag) return;
+			let tagElement = document.createElement('span');
+			tagElement.innerText = tag.beschreibung;
+			tagElement.title = tag.notiz;
+			tagElement.className = "tag " + tag.style;
+			if (tag.done) tagElement.className += " tag_done";
+
+			tagElement.addEventListener('click', (event) => {
+				event.stopPropagation();
+				event.preventDefault();
+				tagComponent.editTag(tag.id);
+			});
+
+			container.appendChild(tagElement);
+		});
+
+		if (parsedTags.length > maxVisibleTags) {
+			let toggle = document.createElement('button');
+			toggle.innerText = (rowData._tagExpanded ? '- ' : '+ ') + (parsedTags.length - maxVisibleTags);
+			toggle.className = "display_all";
+			toggle.title = rowData._tagExpanded ? "Tags ausblenden" : "Tags einblenden";
+
+			toggle.addEventListener('click', () => {
+				rowData._tagExpanded = !rowData._tagExpanded;
+				renderTags();
+			});
+
+			container.appendChild(toggle);
+		}
+	};
+
+	renderTags();
+	return container;
+}
\ No newline at end of file

From e78482e947066a8af3e312c9b0e2ecd9a307f3f9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 5 Dec 2025 12:31:02 +0100
Subject: [PATCH 11/37] - refactor sum points - create green row background for
 current RT

---
 public/css/Studentenverwaltung.css            |  6 +++
 .../Aufnahmetermine/Aufnahmetermine.js        | 48 ++++++++++++++++++-
 .../Aufnahmetermine/HeaderReihungstest.js     | 28 +++++++++--
 3 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index eb6becc15..1a2436dfd 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -74,6 +74,12 @@ html.fs_huge {
 	color: var(--gray-500);
 }
 
+/* Aufnahme Termine: background color green*/
+.stv-details-admission-table .row-green{
+    background-color: lightgreen !important;
+    //color: var(--green-200);
+}
+
 /* Dropdown Toolbar Interessent, submenu */
 .dropend .dropdown-toggle.d-flex::after {
 	height: 0;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index d03569df4..70780ac0a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -35,13 +35,49 @@ export default {
 		student: Object
 	},
 	data() {
+		let self = this;
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					ApiStvAdmissionDates.getAufnahmetermine(this.student.person_id)
 				),
-				ajaxResponse: (url, params, response) => response.data,
+				ajaxResponse: (url, params, response) => {
+					const data = response.data;
+
+					const filtered = data.filter(item =>
+						item.studiengangkurzbzlang === this.student.studiengang ||
+						item.stg_kuerzel === this.student.studiengang
+					);
+
+					if (filtered.length > 0) {
+						filtered.sort((a, b) =>
+							this.parseSemester(b.studiensemester) - this.parseSemester(a.studiensemester)
+						);
+						self.youngestSemester = filtered[0].studiensemester;
+					} else {
+						self.youngestSemester = null;
+					}
+
+					return data;
+				},
+				rowFormatter: function(row) {
+					let data = row.getData(); // get data for this row
+
+					if (data.studiengangkurzbzlang == self.student.studiengang &&
+						data.studiensemester === self.youngestSemester) {
+						let cells = row.getCells();
+
+						cells.forEach((c) => {
+								c.getElement().classList.add("row-green");
+							}
+
+						);
+					}
+				},
+				dataLoaded: function() {
+					this.redraw(true);
+				},
 				columns: [
 					{title: "rt_id", field: "rt_id", visible: false},
 					{title: "rt_person_id", field: "rt_person_id", visible: false},
@@ -187,7 +223,8 @@ export default {
 			listPlacementTests: [],
 			listStudyPlans: [],
 			filterOnlyFutureTestsSet: false,
-			filteredPlacementTests: []
+			filteredPlacementTests: [],
+			youngestSemester: null
 		}
 	},
 	methods: {
@@ -331,6 +368,13 @@ export default {
 		resetForm() {
 			this.formData = {};
 		},
+		parseSemester(semester) {
+			const type = semester.slice(0, 2).toUpperCase(); // "WS" or "SS"
+			const year = parseInt(semester.slice(2), 10);
+
+			// WS > SS
+			return year * 10 + (type === 'SS' ? 1 : 2);
+		}
 	},
 	created() {
 		this.$api
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
index dbf6e3154..a6f50d032 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
@@ -49,12 +49,34 @@ export default {
 				.then(result => {
 					this.listAufnahmetermine = result.data;
 
+					//TODO(Manu) check logic Fas STG
+					const hasMatch = this.listAufnahmetermine
+						.some(item => item.studiengangkurzbzlang === this.student.studiengang);
+					if(!hasMatch){
+						this.formData.rt_gesamtpunkte = 0;
+						this.$fhcAlert.alertError("Studiengang nicht enthalten: " + this.student.studiengang);
+						return;
+					}
+
 					const listAufnahmetermineFiltered = this.listAufnahmetermine
 						.filter(item => item.studiengangkurzbzlang == this.student.studiengang)
 						.sort((a, b) => this.parseSemester(b.studiensemester) - this.parseSemester(a.studiensemester));
-					const elementSemYoungest = listAufnahmetermineFiltered[0];
 
-					this.formData.rt_gesamtpunkte = elementSemYoungest.punkte;
+					let pointsSemStg = 0;
+
+					if(listAufnahmetermineFiltered.length > 0){
+
+						const youngestSemester = listAufnahmetermineFiltered[0].studiensemester;
+
+						//sum of all rt-points of studiengang of youngest sem
+						pointsSemStg = listAufnahmetermineFiltered
+							.filter(item => item.studiensemester === youngestSemester)
+							.reduce((sum, item) => sum + (Number(item.punkte) || 0), 0);
+					}
+					else
+						pointsSemStg = 0;
+
+					this.formData.rt_gesamtpunkte = pointsSemStg;
 
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -91,7 +113,7 @@ export default {
 	},
 	template: `
 		<div class="stv-details-admission-header-placement h-100 pb-3">
-			<h4>{{ $p.t('lehre', 'studiengang') }}</h4>
+			<h4>{{ $p.t('lehre', 'studiengang') }}</h4> {{student.studiengang}}
 						
 			<form-form class="mt-3" ref="formRtGesamtData" @submit.prevent>
 				<div v-if="showAufnahmegruppen" class="row mb-3">

From 43497b186d428d8e65f0d0f0e18b2d7380328c06 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 9 Dec 2025 11:43:39 +0100
Subject: [PATCH 12/37] return empty array if there is no placementtest instead
 of error

---
 .../api/frontend/v1/stv/Aufnahmetermine.php          | 12 ++++++++++--
 .../Details/Aufnahmetermine/Aufnahmetermine.js       |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 26033908d..c7d8ca296 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -224,7 +224,11 @@ class Aufnahmetermine extends FHCAPI_Controller
 			)
 		);
 
-		$data = $this->getDataOrTerminateWithError($result);
+		//check if existing placementtest
+		if(!hasData($result))
+			$this->terminateWithSuccess([]);
+		else
+			$data = getData($result);
 
 		$studienplan_arr = [];
 		$include_ids = [];
@@ -238,7 +242,11 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$person_id = $this->_getPersonId($prestudent_id);
 		$resultRt = $this->ReihungstestModel->getReihungstestPerson($person_id);
 
-		$dataRt = $this->getDataOrTerminateWithError($resultRt);
+		//check if existing placementtest
+		if(!hasData($result))
+			$this->terminateWithSuccess([]);
+		else
+			$dataRt = getData($resultRt);
 
 		foreach ($dataRt as $item)
 		{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 70780ac0a..ecd8b4059 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -380,7 +380,9 @@ export default {
 		this.$api
 			.call(ApiStvAdmissionDates.getListPlacementTests(this.student.prestudent_id))
 			.then(result => {
-				this.listPlacementTests = this.filteredPlacementTests = result.data;
+				if(result.data)
+					this.listPlacementTests = this.filteredPlacementTests = result.data;
+
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 

From 1176c8d6e4055909d032bfcb0e3c4dba2daefdee Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 10 Dec 2025 09:49:00 +0100
Subject: [PATCH 13/37] - use studiengang_kz and studiengangkurzbz of
 studienordnung of persontRT - add check for existing studiengang - use
 studiengang_kz instead studiengangkurzbz for filter and background green

---
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 36 +++++++++++++++++--
 .../Aufnahmetermine/Aufnahmetermine.js        | 32 +++++++----------
 .../Aufnahmetermine/HeaderReihungstest.js     | 13 ++-----
 3 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index c7d8ca296..c9a114b3b 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -36,15 +36,44 @@ class Aufnahmetermine extends FHCAPI_Controller
 		// Load models
 		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
 		$this->load->model('crm/RtPerson_model', 'RtPersonModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
 	public function getAufnahmetermine($person_id)
 	{
 		$result = $this->ReihungstestModel->getReihungstestPerson($person_id);
+		$arrayRt = $this->getDataOrTerminateWithError($result);
 
-		$data = $this->getDataOrTerminateWithError($result);
+		foreach ($arrayRt as $item) {
+			//Studienplan
+			$result = $this->StudienplanModel->loadWhere([
+				'studienplan_id' => $item->studienplan_id
+			]);
+			$data = $this->getDataOrTerminateWithError($result);
+			$studienordnung_id_ber = current($data)->studienordnung_id;
 
-		$this->terminateWithSuccess($data);
+			//Studienordnung
+			$result = $this->StudienordnungModel->loadWhere([
+				'studienordnung_id' => $studienordnung_id_ber
+			]);
+			$data = $this->getDataOrTerminateWithError($result);
+			$studiengang_kz_ber = current($data)->studiengang_kz;
+
+			//Studiengang von studiengang_kz_ber
+			$result = $this->StudiengangModel->load($studiengang_kz_ber);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			$studiengangkurzbzlang_ber = current($data)->kurzbzlang;
+			$typ_ber = current($data)->typ;
+
+			//add to Array
+			$item->studiengang_kz_ber = $studiengang_kz_ber;
+			$item->studiengangkurzbzlang_ber = $studiengangkurzbzlang_ber;
+			$item->studiengangtyp_ber = $typ_ber;
+		}
+		$this->terminateWithSuccess($arrayRt);
 	}
 
 	public function insertAufnahmetermin()
@@ -60,7 +89,6 @@ class Aufnahmetermine extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 		}
 
-
 		$rt_id = (isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
 		$anmeldedatum =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
 		$teilgenommen =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
@@ -237,6 +265,8 @@ class Aufnahmetermine extends FHCAPI_Controller
 			if($item->studienplan_id != null)
 				$studienplan_arr[] = $item->studienplan_id;
 		}
+		if(!hasData($studienplan_arr))
+			$this->terminateWithSuccess([]);
 
 		//get Placementtests Person
 		$person_id = $this->_getPersonId($prestudent_id);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index ecd8b4059..f73929ab6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -46,8 +46,7 @@ export default {
 					const data = response.data;
 
 					const filtered = data.filter(item =>
-						item.studiengangkurzbzlang === this.student.studiengang ||
-						item.stg_kuerzel === this.student.studiengang
+						item.studiengang_kz_ber === this.student.studiengang_kz
 					);
 
 					if (filtered.length > 0) {
@@ -62,17 +61,15 @@ export default {
 					return data;
 				},
 				rowFormatter: function(row) {
-					let data = row.getData(); // get data for this row
+					let data = row.getData();
 
-					if (data.studiengangkurzbzlang == self.student.studiengang &&
+					if (data.studiengang_kz_ber === self.student.studiengang_kz &&
 						data.studiensemester === self.youngestSemester) {
-						let cells = row.getCells();
-
-						cells.forEach((c) => {
-								c.getElement().classList.add("row-green");
-							}
-
-						);
+							let cells = row.getCells();
+							cells.forEach((c) => {
+									c.getElement().classList.add("row-green");
+								}
+							);
 					}
 				},
 				dataLoaded: function() {
@@ -124,8 +121,9 @@ export default {
 					{title: "ort", field: "ort", visible: false},
 					{title: "studienplan", field: "studienplan", visible: false},
 					{title: "studienplan_id", field: "studienplan_id", visible: false},
-					{title: "stg", field: "studiengangkurzbzlang"},
-					{title: "Stg", field: "stg_kuerzel"},
+					//{title: "stg", field: "studiengangkurzbzlang"},
+					{title: "stg_ber", field: "studiengangkurzbzlang_ber"},
+					{title: "stg_kz", field: "studiengang_kz_ber", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -209,12 +207,9 @@ export default {
 						cm.getColumnByField('studienplan_id').component.updateDefinition({
 							title: this.$p.t('ui', 'studienplan_id')
 						});
-						cm.getColumnByField('studiengangkurzbzlang').component.updateDefinition({
+						cm.getColumnByField('studiengangkurzbzlang_ber').component.updateDefinition({
 							title: this.$p.t('projektarbeitsbeurteilung', 'studiengang')
 						});
-						cm.getColumnByField('stg_kuerzel').component.updateDefinition({
-							title: this.$p.t('admission', 'stg_kurz')
-						});
 					}
 				}
 			],
@@ -382,7 +377,6 @@ export default {
 			.then(result => {
 				if(result.data)
 					this.listPlacementTests = this.filteredPlacementTests = result.data;
-
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
@@ -396,7 +390,7 @@ export default {
 	template: `
 	<div class="stv-details-admission-table h-100 pb-3">
 		<h4>{{$p.t('admission', 'allgemein')}}</h4>
-		
+
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
index a6f50d032..521143995 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
@@ -49,17 +49,8 @@ export default {
 				.then(result => {
 					this.listAufnahmetermine = result.data;
 
-					//TODO(Manu) check logic Fas STG
-					const hasMatch = this.listAufnahmetermine
-						.some(item => item.studiengangkurzbzlang === this.student.studiengang);
-					if(!hasMatch){
-						this.formData.rt_gesamtpunkte = 0;
-						this.$fhcAlert.alertError("Studiengang nicht enthalten: " + this.student.studiengang);
-						return;
-					}
-
 					const listAufnahmetermineFiltered = this.listAufnahmetermine
-						.filter(item => item.studiengangkurzbzlang == this.student.studiengang)
+						.filter(item => item.studiengang_kz_ber == this.student.studiengang_kz)
 						.sort((a, b) => this.parseSemester(b.studiensemester) - this.parseSemester(a.studiensemester));
 
 					let pointsSemStg = 0;
@@ -114,7 +105,7 @@ export default {
 	template: `
 		<div class="stv-details-admission-header-placement h-100 pb-3">
 			<h4>{{ $p.t('lehre', 'studiengang') }}</h4> {{student.studiengang}}
-						
+
 			<form-form class="mt-3" ref="formRtGesamtData" @submit.prevent>
 				<div v-if="showAufnahmegruppen" class="row mb-3">
 					<div class="col-1">

From b4668aa6bcb05169a16c5e22e3512f1471bdd83a Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 11 Dec 2025 08:58:05 +0100
Subject: [PATCH 14/37] verbandsbaum zu/ausklappbar

---
 public/css/Studentenverwaltung.css              |  9 +++++++++
 public/js/components/Stv/Studentenverwaltung.js | 11 ++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index eb6becc15..a4bc2e7cd 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -116,6 +116,15 @@ html.fs_huge {
 		position: inherit;
 		z-index: 1;
 	}
+
+	.sidebar-collapsed #sidebarMenu {
+		display: none !important;
+	}
+
+	.sidebar-collapsed .container-fluid > .row > main {
+		flex: 0 0 100%;
+		max-width: 100%;
+	}
 }
 
 
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e3a750e0c..413a1cd6b 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -89,6 +89,7 @@ export default {
 	},
 	data() {
 		return {
+			sidebarCollapsed: false,
 			appconfig: {},
 			configEndpoints: ApiStvConfig,
 			selected: [],
@@ -494,7 +495,7 @@ export default {
 		this.handlePersonUrl();
 	},
 	template: /* html */`
-	<div class="stv">
+		<div class="stv" :class="{ 'sidebar-collapsed': sidebarCollapsed }">
 		<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
@@ -509,6 +510,14 @@ export default {
 					<span class="svg-icon svg-icon-apps"></span>
 				</button>
 				<a class="navbar-brand me-0" :href="stvRoot">StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}</a>
+				<button
+					class="btn btn-outline-light border-0 d-none d-md-inline-flex m-1  ms-auto"
+					type="button"
+					@click="sidebarCollapsed = !sidebarCollapsed"
+					:aria-label="$p.t('ui/toggle_nav')"
+				>
+					<span class="fa-solid fa-list"></span>
+				</button>
 			</div>
 			<button
 				class="btn btn-outline-light border-0 d-md-none m-1 collapsed"

From f40f554c6ba49073edab7b9ddc353220c9b93a00 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 11 Dec 2025 10:53:15 +0100
Subject: [PATCH 15/37] add logic for config FAS_REIHUNGSTEST_EXCLUDE_GEBIETE

---
 .../controllers/Studentenverwaltung.php       |  4 +-
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 22 +++---
 application/models/crm/Reihungstest_model.php | 68 +++++++++++++++----
 application/views/Studentenverwaltung.php     |  1 +
 .../js/components/Stv/Studentenverwaltung.js  |  1 +
 .../Aufnahmetermine/Aufnahmetermine.js        | 22 ++++--
 6 files changed, 87 insertions(+), 31 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 2ce19c58a..a06c39716 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -28,7 +28,7 @@ class Studentenverwaltung extends Auth_Controller
 				'basis/prestudentstatus' => $this->permissionlib->isBerechtigt('basis/prestudentstatus'),
 				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
 				'admin' => $this->permissionlib->isBerechtigt('admin'),
-				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz', 'suid'),
 				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
 				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht'),
 				'system/change_outputformat' => $this->permissionlib->getOE_isEntitledFor('system/change_outputformat'),
@@ -39,3 +39,5 @@ class Studentenverwaltung extends Auth_Controller
 		]);
 	}
 }
+
+
diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index c9a114b3b..437ba42ad 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -392,6 +392,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$person_id = $this->input->get('person_id');
 		$punkte = $this->input->get('punkte');
 		$reihungstest_id = $this->input->get('reihungstest_id');
+		$has_excluded_gebiete = $this->input->get('hasExcludedAreas');
 
 		if(!$reihungstest_id)
 		{
@@ -402,22 +403,27 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$studiengang_kz = $this->input->get('studiengang_kz');
 
 		$this->load->model('testtool/Ablauf_model', 'AblaufModel');
-		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz);
+		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz, 1);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$weightedArray = [];
+		$basis_gebiet_id_arr = [];
+		$basis_gebiet_id_toString = '';
 		foreach ($data as $abl)
 		{
 			$weightedArray[$abl->gebiet_id] = $abl->gewicht;
+			$basis_gebiet_id_arr[]= $abl->gebiet_id;
 		}
+		$basis_gebiet_id_toString = implode(', ', $basis_gebiet_id_arr);
 
-		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray);
-
-/*		if (isError($result))
-		{
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}*/
-
+		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson(
+			$person_id,
+			$punkte,
+			$reihungstest_id,
+			$weightedArray,
+			$has_excluded_gebiete,
+			$basis_gebiet_id_toString
+		);
 		$this->terminateWithSuccess($result);
 	}
 
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
index a685b01cd..efef0a8fa 100644
--- a/application/models/crm/Reihungstest_model.php
+++ b/application/models/crm/Reihungstest_model.php
@@ -10,7 +10,7 @@ class Reihungstest_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'public.tbl_reihungstest';
 		$this->pk = 'reihungstest_id';
-	}	
+	}
 	
 	/**
 	 * Gets a test from a test id only if it is available
@@ -42,8 +42,8 @@ class Reihungstest_model extends DB_Model
 	/**
 	 * Checks if there are active studyplans which have no public placement tests assigned yet.
 	 * Only check assignment to studyplans that are
-	 *	- Bachelor, 
-	 *	- active, 
+	 *	- Bachelor,
+	 *	- active,
 	 *	- set as online application
 	 *  - valid for 1st terms
 	 * @return array Returns object array with studyplans that have no public placement tests assigned yet.
@@ -97,7 +97,7 @@ class Reihungstest_model extends DB_Model
 					USING (reihungstest_id)
 				WHERE 
 					datum >= now() 
-				AND 
+				AND
 					oeffentlich = \'t\'
 				)
 			';
@@ -105,7 +105,7 @@ class Reihungstest_model extends DB_Model
 		return $this->execQuery($query);
 	}
 	
-	/**	
+	/**
 	 *  Gets amount of free places.
 	 * @return array Returns object array with faculty and amount of free places
 	 * for each public actual placement test date.
@@ -432,10 +432,10 @@ class Reihungstest_model extends DB_Model
 	}
 
 	/**
- * Loads all applicants of a placement test
- * @param integer $reihungstest_id ID of placement test
- * @return array Returns object array with data of applicants.
- */
+	 * Loads all applicants of a placement test
+	 * @param integer $reihungstest_id ID of placement test
+	 * @return array Returns object array with data of applicants.
+	 */
 	public function getApplicantsOfPlacementTest($reihungstest_id)
 	{
 		$query = '
@@ -556,13 +556,22 @@ class Reihungstest_model extends DB_Model
 	 * Calculates Result of Placement Test for a given Person and given placementtest
 	 * and with taking account of weighting per area
 	 *
-	 * @param $person_id ID of Person
-	 * @param $punkte if true result is points else result is percentage of sum
-	 * @param $reihungstest_id ID of Placementtest
-	 * @param $weightedArray array of weighting per area (gewicht per gebiet_id)
-	 * @return float result
+	 * @param Number $person_id ID of Person
+	 * @param Boolean $punkte if true result is points else result is percentage of sum
+	 * @param Number $reihungstest_id ID of Placementtest
+	 * @param Array $weightedArray array of weighting per area (gewicht per gebiet_id)
+	 * @param Boolean $has_excluded_gebiete if true, areas in the configArray will be excluded
+	 * @param Array $basis_gebiet_id_toString areas to exclude
+	 * @return float result points of RT
 	 */
-	public function getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray = null)
+	public function getReihungstestErgebnisPerson(
+		$person_id,
+		$punkte,
+		$reihungstest_id,
+		$weightedArray = null,
+		$has_excluded_gebiete = false,
+		$basis_gebiet_id_toString = null
+	)
 	{
 		$parametersArray = array($reihungstest_id);
 
@@ -577,6 +586,35 @@ class Reihungstest_model extends DB_Model
 				WHERE
 					reihungstest_id = ? ";
 
+		//areas of Studiengang
+		if (!empty($basis_gebiet_id_toString))
+		{
+			$qry .= "
+				AND
+					gebiet_id IN (". $basis_gebiet_id_toString. ")
+			";
+		}
+
+		//areas to exclude
+		if($has_excluded_gebiete)
+		{
+			if (defined('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE') && !empty(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE))
+			{
+				$excluded_gebiete = unserialize(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE);
+				$exclude_gebiet_id_arr = $excluded_gebiete;
+				if (is_array($exclude_gebiet_id_arr) && count($exclude_gebiet_id_arr) > 0)
+				{
+					$exclude_gebiet_id_toString = implode(', ', $exclude_gebiet_id_arr);
+					$qry .= "
+							AND
+								gebiet_id NOT IN (". $exclude_gebiet_id_toString. ")
+						--	AND
+						--		typ = 'b'
+						";
+				}
+			}
+		}
+
 		//using prestudent Status to avoid to get the sum of more than 1 placement tests
 		$qry .= "
 				AND prestudent_id = (
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 1cd28d735..2c2a7e955 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -45,6 +45,7 @@ $configArray = [
 	'showAufnahmegruppen' => !defined('FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN') ? false : FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN,
 	'allowUebernahmePunkte' => !defined('FAS_REIHUNGSTEST_PUNKTEUEBERNAHME') ? true : FAS_REIHUNGSTEST_PUNKTEUEBERNAHME,
 	'useReihungstestPunkte' => !defined('FAS_REIHUNGSTEST_PUNKTE') ? true : FAS_REIHUNGSTEST_PUNKTE,
+	'hasExcludedAreas' => defined('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE') && !empty(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE),
 ];
 ?>
 
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 03f84f75e..ea2d20b51 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -84,6 +84,7 @@ export default {
 			configShowAufnahmegruppen: this.config.showAufnahmegruppen,
 			configAllowUebernahmePunkte: this.config.allowUebernahmePunkte,
 			configUseReihungstestPunkte: this.config.useReihungstestPunkte,
+			configHasExcludedAreas: this.config.hasExcludedAreas,
 			appConfig: Vue.computed(() => this.appconfig)
 		}
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index f73929ab6..a746ce165 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -23,6 +23,10 @@ export default {
 			from: 'configUseReihungstestPunkte',
 			default: true
 		},
+		hasExcludedAreas: {
+			from: 'configHasExcludedAreas',
+			default: false
+		},
 		$reloadList: {
 			from: '$reloadList',
 			required: true
@@ -123,7 +127,7 @@ export default {
 					{title: "studienplan_id", field: "studienplan_id", visible: false},
 					//{title: "stg", field: "studiengangkurzbzlang"},
 					{title: "stg_ber", field: "studiengangkurzbzlang_ber"},
-					{title: "stg_kz", field: "studiengang_kz_ber", visible: false},
+					{title: "Stg_Kz", field: "studiengang_kz_ber", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -136,7 +140,7 @@ export default {
 							button.innerHTML = '<i class="fa fa-edit"></i>';
 							button.title = this.$p.t('ui', 'bearbeiten');
 							button.addEventListener('click', (event) =>
-								this.actionEditPlacementTest(cell.getData().rt_person_id)
+								this.actionEditPlacementTest(cell.getData().rt_person_id, cell.getData().studiengang_kz_ber)
 							);
 							container.append(button);
 
@@ -219,7 +223,8 @@ export default {
 			listStudyPlans: [],
 			filterOnlyFutureTestsSet: false,
 			filteredPlacementTests: [],
-			youngestSemester: null
+			youngestSemester: null,
+			stgRtPers: null
 		}
 	},
 	methods: {
@@ -229,11 +234,12 @@ export default {
 			this.formData.anmeldedatum = new Date();
 			this.$refs.placementTestModal.show();
 		},
-		actionEditPlacementTest(rt_person_id) {
+		actionEditPlacementTest(rt_person_id, stg_kz) {
 			this.resetForm();
 			this.statusNew = false;
 			this.loadPlacementTest(rt_person_id);
 			this.$refs.placementTestModal.show();
+			this.stgRtPers = stg_kz;
 		},
 		actionDeletePlacementTest(rt_person_id) {
 			this.$fhcAlert
@@ -303,12 +309,13 @@ export default {
 					this.reload();
 				});
 		},
-		getResultReihungstest(reihungstest_id){
+		getResultReihungstest(reihungstest_id, stg_kz){
 			const paramsRt = {
 				reihungstest_id: reihungstest_id,
 				person_id: this.student.person_id,
 				punkte: this.useReihungstestPunkte,
-				studiengang_kz: this.student.studiengang_kz
+				studiengang_kz: stg_kz,
+				hasExcludedAreas: this.hasExcludedAreas
 			};
 
 			return this.$api
@@ -362,6 +369,7 @@ export default {
 		},
 		resetForm() {
 			this.formData = {};
+			this.stgRtPers = null;
 		},
 		parseSemester(semester) {
 			const type = semester.slice(0, 2).toUpperCase(); // "WS" or "SS"
@@ -528,7 +536,7 @@ export default {
 				
 					<div v-if="allowUebernahmePunkte" class="col-4">
 						<label class="form-label" style="color:transparent;">getPunkte</label>
-						<button class="btn btn-outline-secondary w-100" @click="getResultReihungstest(formData.rt_id)">{{ $p.t('admission', 'getRTErgebnis') }}</button>
+						<button class="btn btn-outline-secondary w-100" @click="getResultReihungstest(formData.rt_id, stgRtPers)">{{ $p.t('admission', 'getRTErgebnis') }}</button>
 					</div>
 
 				</div>				

From 0a2afadb0a27fd6c6b978a07379aa7437a2a89fc Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 26 Jan 2026 13:21:20 +0100
Subject: [PATCH 16/37] tagheaderfilter bug fix

---
 public/js/tabulator/filters/extendedHeaderFilter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/tabulator/filters/extendedHeaderFilter.js b/public/js/tabulator/filters/extendedHeaderFilter.js
index 6a995343f..5ffbb1ab7 100644
--- a/public/js/tabulator/filters/extendedHeaderFilter.js
+++ b/public/js/tabulator/filters/extendedHeaderFilter.js
@@ -146,7 +146,7 @@ export function tagHeaderFilter(headerValue, rowValue, rowData, filterParams)
 	if (Array.isArray(data))
 	{
 		combinedText = data
-			.filter(item => item?.done === false)
+			.filter(item => item?.done !== true)
 			.map(item => `${item?.beschreibung} ${item?.notiz}`)
 			.join(' ');
 	}

From afc45443046012ac037a72f5306c69e819156aee Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 26 Jan 2026 14:09:07 +0100
Subject: [PATCH 17/37] use showVariables properties directly in
 tabulatorOptions and tabulatorEvents moved to computed, so they are used only
 if user has not customized columns visibility in localstorage

---
 public/js/components/Notiz/Notiz.js | 122 ++++++++++++++--------------
 1 file changed, 59 insertions(+), 63 deletions(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 39f0e507e..12b76d2c7 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -50,7 +50,47 @@ export default {
 	},
 	data() {
 		return {
-			tabulatorOptions: {
+			notizen: [],
+			multiupload: true,
+			mitarbeiter: [],
+			filteredMitarbeiter: [],
+			zwischenvar: '',
+			editorInitialized: false,
+			editor: null,
+			notizData: {
+				typeId: this.typeId,
+				titel: null,
+				statusNew: true,
+				text: '',
+				lastUpdate: null,
+				von: null,
+				bis: null,
+				document: null,
+				erledigt: false,
+				verfasser: null,
+				bearbeiter: null,
+				anhang: []
+			},
+			showVariables: {
+				showTitel: false,
+				showText: false,
+				showVerfasser: false,
+				showBearbeiter: false,
+				showVon: false,
+				showBis: false,
+				showDokumente: false,
+				showErledigt: false,
+				showNotiz_id: false,
+				showNotizzuordnung_id: false,
+				showType_id: false,
+				showId: false,
+				showLastupdate: false
+			},
+		}
+	},
+	computed: {
+		tabulatorOptions: function() {
+			return {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(this.endpoint.getNotizen(this.id, this.typeId)),
 				ajaxParams: () => {
@@ -65,6 +105,7 @@ export default {
 						title: "Titel",
 						field: "titel",
 						width: 100,
+						visible: this.showVariables.showTitel,
 						tooltip:function(e, cell, onRendered){
 							var el = document.createElement("div");
 							el.style.backgroundColor = "white";
@@ -87,6 +128,7 @@ export default {
 						width: 250,
 						formatter: "html",
 						//clipContents: true,
+						visible: this.showVariables.showText,
 						tooltip:function(e, cell, onRendered){
 							var el = document.createElement("div");
 							el.style.backgroundColor = "white";
@@ -101,13 +143,13 @@ export default {
 							return el;
 						},
 					},
-					{title: "VerfasserIn", field: "verfasser", width: 124},
-					{title: "BearbeiterIn", field: "bearbeiter", width: 126},
+					{title: "VerfasserIn", field: "verfasser", width: 124, visible: this.showVariables.showVerfasser},
+					{title: "BearbeiterIn", field: "bearbeiter", width: 126, visible: this.showVariables.showBearbeiter},
 					{title: "Verfasser UID", field: "verfasser_uid", width: 124, visible: false},
 					{title: "Bearbeiter UID", field: "bearbeiter_uid", width: 126, visible: false},
-					{title: "Start", field: "start_format", width: 86, visible: false},
-					{title: "Ende", field: "ende_format", width: 86, visible: false},
-					{title: "Dokumente", field: "countdoc", width: 100, visible: false},
+					{title: "Start", field: "start_format", width: 86, visible: this.showVariables.showVon},
+					{title: "Ende", field: "ende_format", width: 86, visible: this.showVariables.showBis},
+					{title: "Dokumente", field: "countdoc", width: 100, visible: this.showVariables.showDokumente},
 					{
 						title: "Erledigt",
 						field: "erledigt",
@@ -120,15 +162,15 @@ export default {
 							crossElement: '<i class="fa fa-xmark text-danger"></i>'
 						}
 					},
-					{title: "Notiz_id", field: "notiz_id", width: 92, visible: false},
-					{title: "Notizzuordnung_id", field: "notizzuordnung_id", width: 164, visible: false},
-					{title: "type_id", field: "type_id", width: 164, visible: false},
-					{title: "extension_id", field: "id", width: 135, visible: false},
+					{title: "Notiz_id", field: "notiz_id", width: 92, visible: this.showVariables.showNotiz_id},
+					{title: "Notizzuordnung_id", field: "notizzuordnung_id", width: 164, visible: this.showVariables.showNotizzuordnung_id},
+					{title: "type_id", field: "type_id", width: 164, visible: this.showVariables.showType_id},
+					{title: "extension_id", field: "id", width: 135, visible: this.showVariables.showId},
 					{
-						title: "letzte Änderung", 
+						title: "letzte Änderung",
 						field: "lastupdate",
 						width: 146,
-						visible: false,
+						visible: this.showVariables.showLastupdate,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							if (!dateStr) return "";
@@ -192,8 +234,10 @@ export default {
 					group: false,
 					page: false,
 				}
-			},
-			tabulatorEvents: [
+			};
+		},
+		tabulatorEvents: function () {
+			return [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -204,56 +248,44 @@ export default {
 
 						cm.getColumnByField('verfasser').component.updateDefinition({
 							title: this.$p.t('notiz', 'verfasser'),
-							visible: this.showVariables.showVerfasser
 						});
 						cm.getColumnByField('verfasser_uid').component.updateDefinition({
 							title: this.$p.t('ui', 'verfasser_uid'),
 						});
 						cm.getColumnByField('titel').component.updateDefinition({
 							title: this.$p.t('global', 'titel'),
-							//visible: this.showVariables.showTitel
 						});
 						cm.getColumnByField('bearbeiter').component.updateDefinition({
 							title: this.$p.t('notiz', 'bearbeiter'),
-							visible: this.showVariables.showBearbeiter
 						});
 						cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
 							title: this.$p.t('ui', 'bearbeiter_uid'),
 						});
 						cm.getColumnByField('start_format').component.updateDefinition({
 							title: this.$p.t('global', 'gueltigVon'),
-							visible: this.showVariables.showVon
 						});
 						cm.getColumnByField('ende_format').component.updateDefinition({
 							title: this.$p.t('global', 'gueltigBis'),
-							visible: this.showVariables.showBis
 						});
 						cm.getColumnByField('countdoc').component.updateDefinition({
 							title: this.$p.t('notiz', 'document'),
-							visible: this.showVariables.showDokumente
 						});
 						cm.getColumnByField('erledigt').component.updateDefinition({
 							title: this.$p.t('notiz', 'erledigt'),
-							visible: this.showVariables.showErledigt
 						});
 						cm.getColumnByField('lastupdate').component.updateDefinition({
 							title: this.$p.t('notiz', 'letzte_aenderung'),
-							visible: this.showVariables.showLastupdate
 						});
 						cm.getColumnByField('notiz_id').component.updateDefinition({
-							visible: this.showVariables.showNotiz_id,
 							title: this.$p.t('ui', 'notiz_id')
 						});
 						cm.getColumnByField('notizzuordnung_id').component.updateDefinition({
-							visible: this.showVariables.showNotizzuordnung_id,
 							title: this.$p.t('ui', 'notizzuordnung_id')
 						});
 						cm.getColumnByField('type_id').component.updateDefinition({
-							visible: this.showVariables.showType_id,
 							title: this.$p.t('ui', 'type_id')
 						});
 						cm.getColumnByField('id').component.updateDefinition({
-							visible: this.showVariables.showId,
 							title: this.$p.t('ui', 'extension_id')
 						});
 						cm.getColumnByField('actions').component.updateDefinition({
@@ -271,43 +303,7 @@ export default {
 						this.$refs.table.tabulator.redraw(true);
 					}
 				}
-			],
-			notizen: [],
-			multiupload: true,
-			mitarbeiter: [],
-			filteredMitarbeiter: [],
-			zwischenvar: '',
-			editorInitialized: false,
-			editor: null,
-			notizData: {
-				typeId: this.typeId,
-				titel: null,
-				statusNew: true,
-				text: '',
-				lastUpdate: null,
-				von: null,
-				bis: null,
-				document: null,
-				erledigt: false,
-				verfasser: null,
-				bearbeiter: null,
-				anhang: []
-			},
-			showVariables: {
-				showTitel: false,
-				showText: false,
-				showVerfasser: false,
-				showBearbeiter: false,
-				showVon: false,
-				showBis: false,
-				showDokumente: false,
-				showErledigt: false,
-				showNotiz_id: false,
-				showNotizzuordnung_id: false,
-				showType_id: false,
-				showId: false,
-				showLastupdate: false
-			}
+			];
 		}
 	},
 	methods: {

From 5dcf8bb854cfef061f58beb329eedee08fc0c2ed Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 26 Jan 2026 15:11:00 +0100
Subject: [PATCH 18/37] add showVariables.showErledigt to tabulatorOptions

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

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 12b76d2c7..fb4eda090 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -154,7 +154,7 @@ export default {
 						title: "Erledigt",
 						field: "erledigt",
 						width: 97,
-						visible: false,
+						visible: this.showVariables.showErledigt,
 						formatter:"tickCross",
 						hozAlign:"center",
 						formatterParams: {

From 8903fa878c01e34fd5fd553acce112046de7a927 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 28 Jan 2026 13:33:01 +0100
Subject: [PATCH 19/37] - more prominent view of Active Custom Filter - one
 click filterreset - fhc search bar: resetFilter with submit

---
 .../js/components/Stv/Studentenverwaltung.js  | 12 +++++-
 .../Stv/Studentenverwaltung/List.js           | 38 +++++++++++++++---
 .../Stv/Studentenverwaltung/List/Filter.js    |  6 +++
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 4 files changed, 89 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index cfd229fb0..4df617b8a 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -146,7 +146,8 @@ export default {
 				sprachen: [],
 				geschlechter: []
 			},
-			verbandEndpoint: ApiStvVerband
+			verbandEndpoint: ApiStvVerband,
+			filter: []
 		}
 	},
 	computed: {
@@ -392,6 +393,7 @@ export default {
 			}
 		},
 		onSearch(e) {
+			this.deleteCustomFilter();
 			const searchsettings = { ...this.$refs.searchbar.searchsettings };
 			if (searchsettings.searchstr.length >= 2) {
 				this.blurSearchbar();
@@ -420,6 +422,12 @@ export default {
 			this.$refs.searchbar.$refs.input.blur();
 			this.$refs.searchbar.abort();
 			this.$refs.searchbar.hideresult();
+		},
+		handleCustomFilter(filter){
+			this.filter = filter;
+		},
+		deleteCustomFilter(){
+			this.$refs.stvList.resetFilter();
 		}
 	},
 	created() {
@@ -625,7 +633,7 @@ export default {
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 					<vertical-split>
 						<template #top>
-							<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></stv-list>
+							<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
 						</template>
 						<template #bottom>
 							<stv-details ref="details" :students="selected"></stv-details>
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 045326ae6..aaea8f473 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -36,7 +36,8 @@ export default {
 		studiensemesterKurzbz: String
 	},
 	emits: [
-		'update:selected'
+		'update:selected',
+		'filterActive'
 	],
 	data() {
 		function dateFormatter(cell)
@@ -238,7 +239,7 @@ export default {
 			let today = new Date().toLocaleDateString('en-GB')
 				.replace(/\//g, '_');
 			return "StudentList_" + today + ".csv";
-		}
+		},
 	},
 	watch: {
 		'$p.user_language.value'(n, o) {
@@ -326,6 +327,8 @@ export default {
 		},
 		rowSelectionChanged(data, rows) {
 			this.selectedcount = data.length;
+/*			if (data.length > 0 )
+				console.log("test manu" + this.selectedcount);*/
 			this.lastSelected = this.selected;
 			this.$emit('update:selected', data);
 
@@ -357,13 +360,14 @@ export default {
 		},
 		updateFilter(filter) {
 			this.filter = filter;
+			this.$emit('filterActive', filter);
 			this.updateUrl();
 		},
 		updateUrl(endpoint, first) {
 			this.lastSelected = first ? undefined : this.selected;
 
-			console.log('function param endpoint: ' + JSON.stringify(endpoint));
-			console.log('current endpoint: ' + JSON.stringify(this.currentEndpoint));
+/*			console.log('function param endpoint: ' + JSON.stringify(endpoint));
+			console.log('current endpoint: ' + JSON.stringify(this.currentEndpoint));*/
 
 			if( endpoint === undefined && this.currentEndpoint === null)
 			{
@@ -394,6 +398,7 @@ export default {
 			this.tabulatorOptions.ajaxURL = endpoint.url;
 			this.tabulatorOptions.ajaxParams = { ...params };
 			this.tabulatorOptions.ajaxConfig = {method};
+
 			if (!this.$refs.table.tableBuilt) {
 				if (this.$refs.table.tabulator) {
 					this.$refs.table.tabulator.on("tableBuilt", () => {
@@ -471,6 +476,9 @@ export default {
 				if (el != this.focusObj)
 					this.changeFocus(this.focusObj, el);
 			}
+		},
+		resetFilter(){
+			this.$refs.listfilter.resetFilter();
 		}
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
@@ -486,6 +494,7 @@ export default {
 			v-draggable:copyLink.capture="selectedDragObject"
 			@dragend="dragCleanup"
 		>
+
 			<core-filter-cmpt
 				ref="table"
 				:description="countsToHTML"
@@ -499,11 +508,30 @@ export default {
 				:new-btn-label="$p.t('stv/action_new')"
 				@click:new="actionNewPrestudent"
 				@table-built="translateTabulator"
+				:useSelectionSpan="false"
 			>
+
+			<template #actions v-if="filter.length">
+			  <div class="d-flex align-items-center gap-2 ps-4">
+				<p class="text-danger mb-0">
+				  <strong>{{$p.t('filter','filterActive')}}</strong>
+				</p>
+
+				<button
+				  class="btn btn-outline-danger sm"
+				  :title="$p.t('filter/filterDelete')"
+				  @click="resetFilter"
+				>
+				 <span class="fa-solid fa-filter-circle-xmark"></span>
+				</button>
+			  </div>
+
+			</template>
+
 			<template #filter>
 				<div class="card">
 					<div class="card-body">
-						<list-filter @change="updateFilter" />
+						<list-filter ref="listfilter" @change="updateFilter" :filterActive="filter.length" />
 					</div>
 				</div>
 			</template>
diff --git a/public/js/components/Stv/Studentenverwaltung/List/Filter.js b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
index 0570d8ef2..cc995523e 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/Filter.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
@@ -7,6 +7,9 @@ export default {
 	components: {
 		FilterItem
 	},
+	props: {
+		filterActive: Boolean,
+	},
 	emits: [
 		'change'
 	],
@@ -74,6 +77,9 @@ export default {
 		},
 		remove(index) {
 			this.filters.splice(index, 1);
+		},
+		resetFilter(){
+			this.filters = [];
 		}
 	},
 	created() {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4e8e844dd..81f06b639 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2240,6 +2240,46 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'filter',
+		'phrase' => 'filterDelete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter zurücksetzen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delete filter',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'filter',
+		'phrase' => 'filterActive',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter aktiv',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'filter active',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 	//****************************	 CORE/person
 	array(

From e3b630550a6e1a7fc83932b256038a907d58b090 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 28 Jan 2026 14:42:26 +0100
Subject: [PATCH 20/37] delete comment

---
 public/js/components/Stv/Studentenverwaltung/List.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index aaea8f473..0ed9862a1 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -327,8 +327,6 @@ export default {
 		},
 		rowSelectionChanged(data, rows) {
 			this.selectedcount = data.length;
-/*			if (data.length > 0 )
-				console.log("test manu" + this.selectedcount);*/
 			this.lastSelected = this.selected;
 			this.$emit('update:selected', data);
 

From 683626921b9e98d2dbabc4aaa5b8a3b9aa8b535a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 30 Jan 2026 13:21:40 +0100
Subject: [PATCH 21/37] Tab Mobility: moved tabulator options to computed

---
 .../Details/Mobility/Mobility.js              | 94 ++++++++++---------
 1 file changed, 48 insertions(+), 46 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index ae7f522b5..69cf70467 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -37,7 +37,44 @@ export default {
 	},
 	data() {
 		return {
-			tabulatorOptions: {
+			formData: {
+				von: new Date(),
+				bis: new Date(),
+				mobilitaetsprogramm_code: 7,
+				nation_code: 'A',
+				herkunftsland_code: 'A',
+				bisio_id: null,
+				localPurposes: [],
+				localSupports: [],
+				lehrveranstaltung_id: null,
+				lehreinheit_id: null
+			},
+			statusNew: true,
+			programsMobility: [],
+			listLvs: [],
+			listLes: [],
+			listLvsAndLes: [],
+			listPurposes: [],
+			listSupports: [],
+			tabulatorData: [],
+			layout: 'fitDataStretchFrozen',
+			layoutColumnsOnNewData: false,
+			height: 'auto',
+			minHeight: 200,
+			index: 'bisio_id',
+			persistenceID: 'stv-details-table_mobiliy-2025112401'
+		}
+	},
+	watch: {
+		student(){
+			if (this.$refs.table) {
+				this.$refs.table.reloadTable();
+			}
+		},
+	},
+	computed:{
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					ApiStvMobility.getMobilitaeten(this.student.uid)
@@ -63,8 +100,8 @@ export default {
 					},
 					{
 						title: "Bis",
-						 field: "bis",
-						 formatter: function (cell) {
+						field: "bis",
+						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							if (!dateStr) return "";
 
@@ -109,18 +146,15 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataStretchFrozen',
-				layoutColumnsOnNewData: false,
-				height: 'auto',
-				minHeight: 200,
-				index: 'bisio_id',
-				persistenceID: 'stv-details-table_mobiliy-2025112401'
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'dataLoaded',
 					handler: data => this.tabulatorData = data.map(item => {
-					//	item.actionDiv = document.createElement('div');
+						//	item.actionDiv = document.createElement('div');
 						return item;
 					}),
 				},
@@ -147,43 +181,11 @@ export default {
 						cm.getColumnByField('bisio_id').component.updateDefinition({
 							title: this.$p.t('mobility', 'bisio_id')
 						});
-
-/*						cm.getColumnByField('actions').component.updateDefinition({
-						title: this.$p.t('global', 'aktionen')
-						});*/
 					}
 				}
-			],
-			formData: {
-				von: new Date(),
-				bis: new Date(),
-				mobilitaetsprogramm_code: 7,
-				nation_code: 'A',
-				herkunftsland_code: 'A',
-				bisio_id: null,
-				localPurposes: [],
-				localSupports: [],
-				lehrveranstaltung_id: null,
-				lehreinheit_id: null
-			},
-			statusNew: true,
-			programsMobility: [],
-			listLvs: [],
-			listLes: [],
-			listLvsAndLes: [],
-			listPurposes: [],
-			listSupports: [],
-			tabulatorData: []
-		}
-	},
-	watch: {
-		student(){
-			if (this.$refs.table) {
-				this.$refs.table.reloadTable();
-			}
+			];
+			return events;
 		},
-	},
-	computed:{
 		lv_teile(){
 			return this.listLvsAndLes.filter(lv => lv.lehreinheit_id == this.formData.lehreinheit_id);
 		},

From 99ea6ad3330e0ae3e817789a11022c3800ec862e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 30 Jan 2026 14:26:32 +0100
Subject: [PATCH 22/37] - moved tabulator options to computed - removed unused
 change param - added values to resetModal

---
 public/js/components/Funktionen/Funktionen.js | 81 ++++++++++---------
 1 file changed, 44 insertions(+), 37 deletions(-)

diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index e83eca7e4..568a74c91 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -33,7 +33,40 @@ export default {
 	},
 	data(){
 		return {
-			tabulatorOptions: {
+			isFilterSet: true,
+			listOrgHeads: [],
+			listOrgUnits: [], //Old
+			listAllOrgUnits: [],
+			listOrgUnits_GST: [],
+			listOrgUnits_GMBH: [],
+			formData: {
+				head: 'gst',
+				oe_kurzbz: '',
+				funktion_kurzbz: null,
+				label:'',
+				//funktion_label: '',
+				funktion: null,
+			},
+			statusNew: true,
+			listAllFunctions: [],
+			abortController: {
+				oes: null,
+				functions: null
+			},
+			filteredOes: [],
+			filteredFunctions: [],
+			newBtnStyle: '',
+			selectedFunction: null,
+			selectedOe: null,
+			layout: 'fitDataFill',
+			layoutColumnsOnNewData: false,
+			height: '300',
+			persistenceID: 'core-functions',
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					ApiCoreFunktion.getAllUserFunctions(this.personUID)
@@ -142,12 +175,11 @@ export default {
 						frozen: true
 					}
 				],
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData: false,
-				height: '300',
-				persistenceID: 'core-functions',
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -193,36 +225,11 @@ export default {
 							title: this.$p.t('ui', 'bezeichnung'),
 							width: 140
 						});
-
 					}
 				}
-			],
-			isFilterSet: true,
-			listOrgHeads: [],
-			listOrgUnits: [], //Old
-			listAllOrgUnits: [],
-			listOrgUnits_GST: [],
-			listOrgUnits_GMBH: [],
-			formData: {
-				head: 'gst',
-				oe_kurzbz: '',
-				funktion_kurzbz: null,
-				label:'',
-				//funktion_label: '',
-				funktion: null,
-			},
-			statusNew: true,
-			listAllFunctions: [],
-			abortController: {
-				oes: null,
-				functions: null
-			},
-			filteredOes: [],
-			filteredFunctions: [],
-			newBtnStyle: '',
-			selectedFunction: null,
-			selectedOe: null
-		}
+			];
+			return events;
+		},
 	},
 	watch: {
 		selectedFunction(newVal) {
@@ -340,6 +347,8 @@ export default {
 			this.formData.head = 'gst';
 			this.formData.oe_kurzbz = '';
 			this.formData.funktion_kurzbz = '';
+			this.selectedFunction = null;
+			this.selectedOe= null;
 		},
 		filterFunctions(event) {
 			const query = event.query.toLowerCase();
@@ -460,14 +469,12 @@ export default {
 				</template>
 
 				<form-form class="row pt-3" ref="functionData">
-
 					<form-input
 						container-class="mb-3 col-8"
 						type="select"
 						name="companies"
 						:label="$p.t('core/unternehmen')"
 						v-model="formData.head"
-						@change="getOrgetsForCompanyOld"
 						>
 						<option
 							v-for="org in listOrgHeads"

From f7478ff05caef63a93013ba839f4d7f1b195fefb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 Jan 2026 18:53:31 +0100
Subject: [PATCH 23/37] add config to insertr fhc-build-version into path or
 add it as query string

---
 application/config/javascript.php         |  3 +++
 application/helpers/hlp_header_helper.php | 22 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/application/config/javascript.php b/application/config/javascript.php
index 6f82810e2..8c4c5f9f1 100644
--- a/application/config/javascript.php
+++ b/application/config/javascript.php
@@ -7,3 +7,6 @@ $config['use_vuejs_dev_version'] = false;
 $config['use_bundled_javascript'] = false;
 // systemerror_mailto use in FHC-Alert Plugin - if empty Link will not be rendered
 $config['systemerror_mailto'] = '';
+// use fhcomplete_build_version as path element after public (requires apache mod_rewrite)
+// see <fhc_base_dir>/public/.htaccess for details
+$config['use_fhcomplete_build_version_in_path'] = false;
diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index 309bdedbd..41d40ca0d 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -185,7 +185,15 @@ function generateJSModulesInclude($JSModules)
 
 		for ($tmpJSsCounter = 0; $tmpJSsCounter < count($tmpJSs); $tmpJSsCounter++)
 		{
-			$toPrint = sprintf($jsInclude, base_url($tmpJSs[$tmpJSsCounter].$cachetoken)).PHP_EOL;
+			if($ci->config->item('use_fhcomplete_build_version_in_path'))
+			{
+				$relurl = preg_replace('#public/#', 'public/' . $ci->config->item('fhcomplete_build_version') . '/', $tmpJSs[$tmpJSsCounter]);
+				$toPrint = sprintf($jsInclude, base_url($relurl)).PHP_EOL;
+			}
+			else
+			{
+				$toPrint = sprintf($jsInclude, base_url($tmpJSs[$tmpJSsCounter].$cachetoken)).PHP_EOL;
+			}
 
 			if ($tmpJSsCounter > 0) $toPrint = "\t\t".$toPrint;
 
@@ -250,6 +258,14 @@ function generateSkipLink($skipID)
 function absoluteJsImportUrl($relurl)
 {
 	$ci =& get_instance();
-	$url = base_url($relurl) . '?'. $ci->config->item('fhcomplete_build_version');
+	$ci->load->config('javascript');
+	if($ci->config->item('use_fhcomplete_build_version_in_path'))
+	{
+		$url = base_url(preg_replace('#^public/#', 'public/' . $ci->config->item('fhcomplete_build_version') . '/', $relurl));
+	}
+	else
+	{
+		$url = base_url($relurl) . '?'. $ci->config->item('fhcomplete_build_version');
+	}
 	return $url;
-}
\ No newline at end of file
+}

From 63f198098dd1abdec00537c8ead96ae95fb4b8b8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 Jan 2026 18:55:25 +0100
Subject: [PATCH 24/37] use absoluteJsImportUrl Helper for calendar Event
 renderers

---
 application/config/Events.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/config/Events.php b/application/config/Events.php
index 3e0a5248f..80a8f03b3 100644
--- a/application/config/Events.php
+++ b/application/config/Events.php
@@ -6,30 +6,30 @@ use CI3_Events as Events;
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["lehreinheit"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Lehreinheit/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
 	);
 });
 
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["reservierung"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Reservierungen/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Reservierungen/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
 	);
 });
 
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["ferien"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Feiertage/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Feiertage/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Feiertage/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
 	);
 });
 

From 77abcb6129e53c604d12370f39d4d9e786bd49fc Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 Jan 2026 18:58:20 +0100
Subject: [PATCH 25/37] use absoluteJsImportUrl in Dashboard Widget Api
 Endpoints, send widget setup and arguments column values as json to frontend,
 remove JSON.parse from frontend dashboard code

---
 application/controllers/dashboard/Widget.php  | 41 +++++++++++++++----
 public/js/components/Dashboard/Dashboard.js   |  4 --
 public/js/components/Dashboard/Item.js        |  2 +-
 .../Dashboard/CachedWidgetLoader.js           |  2 -
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
index 0da6fe8da..9966ddc12 100644
--- a/application/controllers/dashboard/Widget.php
+++ b/application/controllers/dashboard/Widget.php
@@ -33,19 +33,26 @@ class Widget extends Auth_Controller
 			return $this->outputJsonSuccess([
 				"widget_id" => 0,
 				"widget_kurzbz" => "notfound",
-				"arguments" => json_encode([
+				"arguments" => [
 					"className" => 'alert-danger',
 					"title" => 'Widget Not Found',
 					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
-				]),
-				"setup" => json_encode([
+				],
+				"setup" => [
 					"name" => 'Widget Not Found',
-					"file" => 'DashboardWidget/Default.js',
+					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
 					"width" => 1,
 					"height" => 1
-				])
+				]
 			]);
-		return $this->outputJsonSuccess(current(getData($widget)));
+
+		$widget = current(getData($widget));
+		$widget->arguments = json_decode($widget->arguments);
+		$tmpsetup = json_decode($widget->setup);
+		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+		$widget->setup = $tmpsetup;
+
+		return $this->outputJsonSuccess($widget);
 	}
 	
 	public function getAll()
@@ -56,7 +63,16 @@ class Widget extends Auth_Controller
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
 
-		$this->outputJsonSuccess(getData($result) ?: []);
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
 	}
 	
 	public function getWidgetsForDashboard()
@@ -71,7 +87,16 @@ class Widget extends Auth_Controller
 			]);
 		}
 
-		$this->outputJsonSuccess(getData($result) ?: []);
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
 	}
 	
 	public function setAllowed()
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 3d781ac72..652a2778e 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -151,10 +151,6 @@ export default {
 				db: this.dashboard
 			}
 		}).then(res => {
-			res.data.retval.forEach(widget => {
-				widget.arguments = JSON.parse(widget.arguments);
-				widget.setup = JSON.parse(widget.setup);
-			});
 			this.widgets = res.data.retval;
 		}).catch(err => console.error('ERROR:', err));
 
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index d2ad4ae75..06a03ae3a 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -144,7 +144,7 @@ export default {
 	},
 	async created() {
 		this.widget = await CachedWidgetLoader.loadWidget(this.id);
-		let component = (await import("../" + this.widget.setup.file)).default;
+		let component = (await import(this.widget.setup.file)).default;
 		this.$options.components["widget" + this.widget.widget_id] = component;
 		this.component = "widget" + this.widget.widget_id;
 		this.arguments = { ...this.widget.arguments, ...this.config };
diff --git a/public/js/composables/Dashboard/CachedWidgetLoader.js b/public/js/composables/Dashboard/CachedWidgetLoader.js
index 3ebe6ddcb..a92e3e557 100644
--- a/public/js/composables/Dashboard/CachedWidgetLoader.js
+++ b/public/js/composables/Dashboard/CachedWidgetLoader.js
@@ -16,8 +16,6 @@ export default {
 
 		__widgetsStarted[id] = new Promise((resolve, reject) => {
 			axios.get(__path, {params:{id}}).then(res => {
-				res.data.retval.arguments = JSON.parse(res.data.retval.arguments);
-				res.data.retval.setup = JSON.parse(res.data.retval.setup);
 				__widgets[id] = res.data.retval;
 				__widgetsStarted[id] = undefined;
 				resolve(__widgets[id]);

From e01d814ae970f7334f2c3ea45269557c044d22ae Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 2 Feb 2026 09:44:47 +0100
Subject: [PATCH 26/37] Tab Dokumente: move tabulator options and event to
 computed

---
 .../Details/Dokumente/List/Accepted.js        | 36 +++++----
 .../Details/Dokumente/List/Unaccepted.js      | 80 ++++++++++---------
 2 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index d8bd2ed82..46029a5d3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -17,7 +17,18 @@ export default {
 	},
 	data(){
 		return {
-			tabulatorOptions: {
+			listDocuments: [],
+			layout: 'fitDataStretchFrozen',
+			layoutColumnsOnNewData: false,
+			height: 300,
+			selectable: true,
+			selectableRangeMode: 'click',
+			persistenceID: 'core-details-documents-accepted-2025072101',
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					ApiStvDocuments.getDocumentsAccepted({
@@ -146,15 +157,11 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataStretchFrozen',
-				layoutColumnsOnNewData: false,
-				height: 300,
-				selectable: true,
-				selectableRangeMode: 'click',
-				persistenceID: 'core-details-documents-accepted-2025072101',
-				listDocuments: [],
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -210,14 +217,15 @@ export default {
 						}
 					}
 				}
-			]
-		}
+			];
+			return events;
+		},
 	},
 	methods: {
 		actionDownloadFile(akte_id){
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router 
-				+ '/api/frontend/v1/stv/dokumente/download?akte_id=' 
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/api/frontend/v1/stv/dokumente/download?akte_id='
 				+ encodeURIComponent(akte_id);
 		},
 		actionUploadFile(dokument_kurzbz){
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 95880e233..9afaea71c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -17,7 +17,19 @@ export default {
 	},
 	data(){
 		return {
-			tabulatorOptions: {
+			layout: 'fitDataStretchFrozen',
+			layoutColumnsOnNewData: false,
+			height: 300,
+			selectable: true,
+			selectableRangeMode: 'click',
+			persistenceID: 'core-details-documents-unaccepted',
+			listDocuments: [],
+			prestudentDocumentData: [],
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					ApiStvDocuments.getDocumentsUnaccepted({
@@ -42,7 +54,7 @@ export default {
 								hour12: false
 							});
 						}
-						},
+					},
 					{title: "nachgereicht", field: "nachgereicht", visible: false,
 						formatter:"tickCross",
 						hozAlign:"center",
@@ -76,7 +88,7 @@ export default {
 							return `${tickCrossIcon} ${pill}`;
 						},
 						hozAlign: "center"
-						},
+					},
 					{title: "Infotext", field: "infotext"},
 					{title: "akte_id", field: "akte_id"},
 					{title: "titel_intern", field: "titel_intern"},
@@ -162,16 +174,11 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataStretchFrozen',
-				layoutColumnsOnNewData: false,
-				height: 300,
-				selectable: true,
-				selectableRangeMode: 'click',
-				persistenceID: 'core-details-documents-unaccepted',
-				listDocuments: [],
-				prestudentDocumentData: [],
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -221,14 +228,15 @@ export default {
 						}
 					}
 				}
-			]
-		}
+			];
+			return events;
+		},
 	},
 	methods: {
 		actionDownloadFile(akte_id){
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router 
-				+ '/api/frontend/v1/stv/dokumente/download?akte_id=' 
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/api/frontend/v1/stv/dokumente/download?akte_id='
 				+ encodeURIComponent(akte_id);
 		},
 		actionUploadFile(dokument_kurzbz){
@@ -277,9 +285,9 @@ export default {
 								dokument_kurzbz: e.dokument_kurzbz
 							}))
 							.then(() => ({
-							success: true,
-							dokument_bz: e.bezeichnung
-						}))
+								success: true,
+								dokument_bz: e.bezeichnung
+							}))
 							.catch(() => ({
 								success: false,
 								dokument_bz: e.bezeichnung
@@ -287,23 +295,23 @@ export default {
 					)
 				)
 				.then(results => {
-						const failed = results.filter(res => !res.value.success);
-						const suceeded = results.filter(res => res.value.success);
-						if (failed.length > 0) {
-							failed.forEach(res => {
-								this.$fhcAlert.alertError(this.$p.t('dokumente', 'errorAccepted',
-									{'dokument_kurzbz': res.value.dokument_bz}
-								));
-							});
-							let countSuceeded = suceeded.length;
-							if(countSuceeded > 0)
-								this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successCountAccepted',
-									{'count': countSuceeded}));
+					const failed = results.filter(res => !res.value.success);
+					const suceeded = results.filter(res => res.value.success);
+					if (failed.length > 0) {
+						failed.forEach(res => {
+							this.$fhcAlert.alertError(this.$p.t('dokumente', 'errorAccepted',
+								{'dokument_kurzbz': res.value.dokument_bz}
+							));
+						});
+						let countSuceeded = suceeded.length;
+						if(countSuceeded > 0)
+							this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successCountAccepted',
+								{'count': countSuceeded}));
 
-						} else {
-							this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successAccepted'));
-						}
-						this.reloadAll();
+					} else {
+						this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successAccepted'));
+					}
+					this.reloadAll();
 				});
 		},
 		deleteFile(akte_id){

From 0539281adfa943a79baca864f187d06aa2adf36c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 2 Feb 2026 11:36:03 +0100
Subject: [PATCH 27/37] Messages: move tabulator options and event to computed

---
 .../Messages/Details/TableMessages.js         | 238 +++++++++---------
 1 file changed, 116 insertions(+), 122 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index a55ddec63..05484090a 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -25,7 +25,103 @@ export default {
 	},
 	data(){
 		return {
-			tabulatorOptions: {
+			previewBody: "",
+			open: false,
+			personId: null,
+			layout: 'fitDataStretchFrozen',
+			layoutColumnsOnNewData:	false,
+			height: '400',
+			persistenceID: 'core-message-2025112401',
+			selectable: 1,
+			selectableRangeMode: 'click',
+			index: 'message_id',
+		}
+	},
+	methods: {
+		actionDeleteMessage(message_id){
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? message_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteMessage)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteMessage(message_id){
+			return this.$api
+				.call(ApiMessages.deleteMessage(message_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		actionNewMessage(){
+			this.$emit('newMessage', this.id, this.typeId);
+		},
+		actionReplyToMessage(message_id){
+			this.$emit('replyToMessage', this.id, this.typeId, message_id);
+		},
+		reload() {
+			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();
+			const messageNested = [];
+			const remainingMessages = new Set(messages);
+
+			//save all Data in Map
+			messages.forEach(msg => messageMap.set(msg.message_id, msg));
+
+			let iteration = 0;
+			let changes = true;
+
+			// do until each relationmessage_id finds message_id (not sensitive to order)
+			while (changes) {
+				changes = false;
+				iteration++;
+
+				remainingMessages.forEach(msg => {
+					if (msg.relationmessage_id === null) {
+						messageNested.push(messageMap.get(msg.message_id));
+						remainingMessages.delete(msg);
+						changes = true;
+					} else if (messageMap.has(msg.relationmessage_id)) {
+
+						const parent = messageMap.get(msg.relationmessage_id);
+
+						if (!parent.children) {
+							parent.children = [];
+						}
+						parent.children.push(messageMap.get(msg.message_id));
+						remainingMessages.delete(msg);
+						changes = true;
+					}
+				});
+
+				// to avoid endless loop
+				if (iteration > messages.length) break;
+			}
+			return {data: messageNested, last_page: last_page};
+		},
+		loadAjaxCall(url, config, params){
+			return this.$api.call(
+				ApiMessages.getMessages(params)
+			);
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.loadAjaxCall,
 				ajaxParams: () => {
@@ -154,13 +250,7 @@ export default {
 						},
 						frozen: true
 					}
-					],
-				layout: 'fitDataStretchFrozen',
-				layoutColumnsOnNewData:	false,
-				height: '400',
-				selectable: 1,
-				selectableRangeMode: 'click',
-				index: 'message_id',
+				],
 				pagination: true,
 				paginationMode: "remote",
 				paginationSize: 15,
@@ -171,7 +261,6 @@ export default {
 				dataTreeCollapseElement:"<i class='fas fa-minus-square'></i>",
 				dataTreeChildIndent: 15,
 				dataTreeStartExpanded: false,
-				persistenceID: 'core-message-2025112401',
 				locale: 'de',
 				"langs": {
 					"de":{ //German language definition
@@ -192,8 +281,11 @@ export default {
 						},
 					},
 				}
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async() => {
@@ -238,118 +330,19 @@ export default {
 							]
 						});
 						this.$refs.table.tabulator.rowManager.getDisplayRows();
-						/*
-						cm.getColumnByField('actions').component.updateDefinition({
-						title: this.$p.t('global', 'aktionen')
-												});
-						*/
 					}
 				},
 				{
 					event: 'rowClick',
 					handler: (e, row) => {
-							const selectedMessage = row.getData().message_id;
-							const body = row.getData().body;
-							this.previewBody = body;
+						const selectedMessage = row.getData().message_id;
+						const body = row.getData().body;
+						this.previewBody = body;
 					}
 				},
-/*
-				{
-					event: 'pageLoaded',
-					handler: (pageno) => {
-						this.pageNo = pageno+1;
-					}
-				}
-*/
-			],
-			previewBody: "",
-			open: false,
-			personId: null,
-		}
-	},
-	methods: {
-		actionDeleteMessage(message_id){
-			this.$fhcAlert
-				.confirmDelete()
-				.then(result => result
-					? message_id
-					: Promise.reject({handled: true}))
-				.then(this.deleteMessage)
-				.catch(this.$fhcAlert.handleSystemError);
+			];
+			return events;
 		},
-		deleteMessage(message_id){
-			return this.$api
-				.call(ApiMessages.deleteMessage(message_id))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(()=> {
-					window.scrollTo(0, 0);
-					this.reload();
-				});
-		},
-		actionNewMessage(){
-			this.$emit('newMessage', this.id, this.typeId);
-		},
-		actionReplyToMessage(message_id){
-			this.$emit('replyToMessage', this.id, this.typeId, message_id);
-		},
-		reload() {
-			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();
-			const messageNested = [];
-			const remainingMessages = new Set(messages);
-
-			//save all Data in Map
-			messages.forEach(msg => messageMap.set(msg.message_id, msg));
-
-			let iteration = 0;
-			let changes = true;
-
-			// do until each relationmessage_id finds message_id (not sensitive to order)
-			while (changes) {
-				changes = false;
-				iteration++;
-
-				remainingMessages.forEach(msg => {
-					if (msg.relationmessage_id === null) {
-						messageNested.push(messageMap.get(msg.message_id));
-						remainingMessages.delete(msg);
-						changes = true;
-					} else if (messageMap.has(msg.relationmessage_id)) {
-
-						const parent = messageMap.get(msg.relationmessage_id);
-
-						if (!parent.children) {
-							parent.children = [];
-						}
-						parent.children.push(messageMap.get(msg.message_id));
-						remainingMessages.delete(msg);
-						changes = true;
-					}
-				});
-
-			// to avoid endless loop
-			if (iteration > messages.length) break;
-			}
-		return {data: messageNested, last_page: last_page};
-		},
-		loadAjaxCall(url, config, params){
-			return this.$api.call(
-				ApiMessages.getMessages(params)
-			);
-		}
-	},
-	computed: {
 		statusText(){
 			return {
 				0: this.$p.t('messsages', 'unread'),
@@ -361,13 +354,13 @@ export default {
 	},
 	mounted() {
 		// change to target="_blank"
-/*		this.$nextTick(() => {
-			const links = document.querySelectorAll('.preview a');
-			links.forEach(link => {
-				link.setAttribute('target', '_blank');
-				link.setAttribute('rel', 'noopener noreferrer'); // Sicherheitsmaßnahme
-			});
-		});*/
+		/*		this.$nextTick(() => {
+					const links = document.querySelectorAll('.preview a');
+					links.forEach(link => {
+						link.setAttribute('target', '_blank');
+						link.setAttribute('rel', 'noopener noreferrer'); // Sicherheitsmaßnahme
+					});
+				});*/
 	},
 	created(){
 		if(this.typeId != 'person_id' && Array.isArray(this.id) && this.id.length === 1) {
@@ -382,6 +375,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		}
+
 	},
 	template: `
 	<div class="messages-detail-table">

From b26df9ac211212ee4f0fd515ebd079aec295b769 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 2 Feb 2026 11:48:02 +0100
Subject: [PATCH 28/37] Tab Kontakt: Bankaccount: move tabulator options to
 computed, fix bug height

---
 .../Details/Kontakt/Address.js                |  2 +-
 .../Details/Kontakt/Bankaccount.js            | 41 +++++++++++--------
 .../Details/Kontakt/Contact.js                |  1 +
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index e4174e378..41ac0bfe2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -45,7 +45,6 @@ export default{
 				suggestions: null,
 				places: null
 			},
-			height:	'auto',
 			index: 'adresse_id',
 			persistenceID: 'stv-details-kontakt-address'
 		}
@@ -151,6 +150,7 @@ export default{
 						frozen: true
 					},
 				],
+				height:	'auto'
 			};
 			return options;
 		},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index d937d3d1c..b4752e0c3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -17,8 +17,20 @@ export default{
 		uid: Number
 	},
 	data() {
-		return{
-			tabulatorOptions: {
+		return {
+			lastSelected: null,
+			bankverbindungData: {
+				verrechnung: true,
+				typ: 'p'
+			},
+			statusNew: true,
+			index: 'bankverbindung_id',
+			persistenceID: 'stv-details-kontakt-bankaccount'
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvBankaccount.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -86,11 +98,12 @@ export default{
 						frozen: true
 					},
 				],
-				height:	'auto',
-				index: 'bankverbindung_id',
-				persistenceID: 'stv-details-kontakt-bankaccount'
-			},
-			tabulatorEvents: [
+				height:	'auto'
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async() => {
@@ -123,19 +136,11 @@ export default{
 						cm.getColumnByField('bankverbindung_id').component.updateDefinition({
 							title: this.$p.t('ui', 'bankverbindung_id')
 						});
-/*						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});*/
 					}
 				}
-			],
-			lastSelected: null,
-			bankverbindungData: {
-				verrechnung: true,
-				typ: 'p'
-			},
-			statusNew: true
-		}
+			];
+			return events;
+		},
 	},
 	watch: {
 		uid() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index f7fad0dfb..d9cc1ad55 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -128,6 +128,7 @@ export default {
 						frozen: true
 					},
 				],
+				height:	'auto'
 			};
 			return options;
 		},

From 5d73f051ba9e421753bea276ddbff0b61af03fa0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Feb 2026 08:13:57 +0100
Subject: [PATCH 29/37] sample .htaccess to use with config option
 use_fhcomplete_build_version_in_path

---
 public/.htaccess_sample | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 public/.htaccess_sample

diff --git a/public/.htaccess_sample b/public/.htaccess_sample
new file mode 100644
index 000000000..e3f3485f6
--- /dev/null
+++ b/public/.htaccess_sample
@@ -0,0 +1,9 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule ^[0-9]{10}/(.*)$ $1 [L]
+    RewriteCond %{REQUEST_URI} ^(.*?)/public/index.ci.php/
+    RewriteRule ^index.ci.php/(.*)$ %1/index.ci.php/$1 [R=303]
+</IfModule>
+

From a3a03f63627cd165f3a3282e8d4913f3354d5347 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Feb 2026 13:49:06 +0100
Subject: [PATCH 30/37] update check system to create or update widget path to
 start with public/...

---
 system/dbupdate_3.4.php                       |  1 +
 system/dbupdate_3.4/25999_C4_dashboard.php    | 16 ++--
 .../71399_dashboard_update_widget_paths.php   | 77 +++++++++++++++++++
 3 files changed, 86 insertions(+), 8 deletions(-)
 create mode 100644 system/dbupdate_3.4/71399_dashboard_update_widget_paths.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index add43ff72..79867ab57 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -89,6 +89,7 @@ require_once('dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php');
 require_once('dbupdate_3.4/69065_Projektarbeiten_Firmen_verwalten.php');
 require_once('dbupdate_3.4/68744_StV_settings.php');
 require_once('dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php');
+require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/25999_C4_dashboard.php b/system/dbupdate_3.4/25999_C4_dashboard.php
index aab20089c..186866f73 100644
--- a/system/dbupdate_3.4/25999_C4_dashboard.php
+++ b/system/dbupdate_3.4/25999_C4_dashboard.php
@@ -39,7 +39,7 @@ if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kur
 				'hallowelt', 
 				'Hallo Welt Widget', 
 				'{"css": "d-flex justify-content-center align-items-center h-100", "title": "Hallo Welt"}'::jsonb,
-				'{"file": "DashboardWidget/Default.js", "icon": "https://upload.wikimedia.org/wikipedia/commons/8/8a/Farben-Testbild.svg", "name": "Hallo Welt", "width": {"max": 99}, "height": {"max": 99}, "hideFooter": false}'::jsonb
+				'{"file": "public/js/components/DashboardWidget/Default.js", "icon": "https://upload.wikimedia.org/wikipedia/commons/8/8a/Farben-Testbild.svg", "name": "Hallo Welt", "width": {"max": 99}, "height": {"max": 99}, "hideFooter": false}'::jsonb
 			);
 EOWHW;
 
@@ -71,7 +71,7 @@ if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kur
 				'news', 
 				'News Widget', 
 				'{}'::jsonb,
-				'{"file": "DashboardWidget/News.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "News", "width": {"max": 4, "min": 1}, "height": {"max": 2, "min": 1}, "cis4link": "/CisVue/Cms/news", "hideFooter": false}'::jsonb
+				'{"file": "public/js/components/DashboardWidget/News.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "News", "width": {"max": 4, "min": 1}, "height": {"max": 2, "min": 1}, "cis4link": "/CisVue/Cms/news", "hideFooter": false}'::jsonb
 			);
 EOWHW;
 
@@ -103,7 +103,7 @@ if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kur
 				'url', 
 				'Bookmark Widget', 
 				'{}'::jsonb,
-				'{"file": "DashboardWidget/Url.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "Bookmark", "width": 1, "height": {"max": 2, "min": 1}, "hideFooter": true}'::jsonb
+				'{"file": "public/js/components/DashboardWidget/Url.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "Bookmark", "width": 1, "height": {"max": 2, "min": 1}, "hideFooter": true}'::jsonb
 			);
 EOWHW;
 
@@ -135,7 +135,7 @@ if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kur
 				'ampel', 
 				'Ampel Widget', 
 				'{}'::jsonb,
-				'{"file": "DashboardWidget/Ampel.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "Ampel", "width": 1, "height": {"max": 2, "min": 1}, "hideFooter": false}'::jsonb
+				'{"file": "public/js/components/DashboardWidget/Ampel.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "Ampel", "width": 1, "height": {"max": 2, "min": 1}, "hideFooter": false}'::jsonb
 			);
 EOWHW;
 
@@ -162,7 +162,7 @@ if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kur
 				widget_kurzbz = 'lvplan', 
 				beschreibung = 'LV-Plan Widget', 
 				arguments = '{"bodyClass": "p-0"}'::jsonb, 
-				setup = '{"file": "DashboardWidget/LvPlan.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "LV-Plan", "width": {"max": 4, "min": 1}, "height": {"max": 3, "min": 1}, "cis4link": "/Cis/LvPlan", "hideFooter": false}'::jsonb 
+				setup = '{"file": "public/js/components/DashboardWidget/LvPlan.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "LV-Plan", "width": {"max": 4, "min": 1}, "height": {"max": 3, "min": 1}, "cis4link": "/Cis/LvPlan", "hideFooter": false}'::jsonb 
 			WHERE
 				widget_kurzbz = 'stundenplan';
 EOWHW;
@@ -195,7 +195,7 @@ if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kur
 				'lvplan', 
 				'LV-Plan Widget', 
 				'{"bodyClass": "p-0"}'::jsonb,
-				'{"file": "DashboardWidget/LvPlan.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "LV-Plan", "width": {"max": 4, "min": 1}, "height": {"max": 3, "min": 1}, "cis4link": "/Cis/LvPlan", "hideFooter": false}'::jsonb
+				'{"file": "public/js/components/DashboardWidget/LvPlan.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "LV-Plan", "width": {"max": 4, "min": 1}, "height": {"max": 3, "min": 1}, "cis4link": "/Cis/LvPlan", "hideFooter": false}'::jsonb
 			);
 EOWHW;
 
@@ -227,7 +227,7 @@ if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kur
 				'studiengang', 
 				'Das Studiengang-Widget enthält Informationen über den Studiengang eines Studenten.', 
 				'{}'::jsonb,
-				'{"file": "DashboardWidget/Studiengang.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "Studiengang", "width": {"max": 2, "min": 1}, "height": {"max": 4, "min": 1}, "hideFooter": true}'::jsonb
+				'{"file": "public/js/components/DashboardWidget/Studiengang.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "Studiengang", "width": {"max": 2, "min": 1}, "height": {"max": 4, "min": 1}, "hideFooter": true}'::jsonb
 			);
 EOWHW;
 
@@ -349,4 +349,4 @@ EOGP;
             echo 'dashboard.tbl_dashboard_preset: Added Student Preset for Dashboard "CIS"<br>';
         }
 	}
-}
\ No newline at end of file
+}
diff --git a/system/dbupdate_3.4/71399_dashboard_update_widget_paths.php b/system/dbupdate_3.4/71399_dashboard_update_widget_paths.php
new file mode 100644
index 000000000..3849d6ec5
--- /dev/null
+++ b/system/dbupdate_3.4/71399_dashboard_update_widget_paths.php
@@ -0,0 +1,77 @@
+<?php
+/* Copyright (C) 2017 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Harald Bamberger <harald.bamberger@technikum-wien.at>,
+ *
+ * Beschreibung:
+ * Dashboard DB Aenderungen
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+$corewidgetssql = 'select tw.* from dashboard.tbl_widget tw where regexp_match((setup->\'file\')::text, \'^"DashboardWidget\') is not NULL';
+if (($rescore = $db->db_query($corewidgetssql)))
+{
+	if ($db->db_num_rows($rescore) > 0)
+	{
+		$coreqry = <<<EOCOREQRY
+
+		update
+			dashboard.tbl_widget
+		set
+			setup = jsonb_set(setup, '{file}', regexp_replace((setup->'file')::text, '^"DashboardWidget', '"public/js/components/DashboardWidget')::jsonb)
+		where
+			regexp_match((setup->'file')::text, '^"DashboardWidget') is not NULL;
+
+EOCOREQRY;
+
+		if (!$db->db_query($coreqry))
+		{
+			echo '<strong>Dashboard Core Widgets Paths Update: '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo '<br>Dashboard Core Widgets Paths updated.';
+		}
+	}
+}
+
+$extwidgetssql = 'select tw.* from dashboard.tbl_widget tw where regexp_match((setup->\'file\')::text, \'^"../../\') is not NULL';
+if (($resext = $db->db_query($extwidgetssql)))
+{
+	if ($db->db_num_rows($resext) > 0)
+	{
+		$extqry = <<<EOEXTQRY
+
+		update
+			dashboard.tbl_widget
+		set
+			setup = jsonb_set(setup, '{file}', regexp_replace((setup->'file')::text, '^"../../', '"public/')::jsonb)
+		where
+			regexp_match((setup->'file')::text, '^"../../') is not NULL;
+
+EOEXTQRY;
+
+		if (!$db->db_query($extqry))
+		{
+			echo '<strong>Dashboard Extensions Widgets Paths Update: '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo '<br>Dashboard Extensions Widgets Paths updated.';
+		}
+	}
+}
\ No newline at end of file

From d192489c6f83accbfdd085ffb558ecf316f15813 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Feb 2026 13:52:04 +0100
Subject: [PATCH 31/37] use correct filename in comment

---
 application/config/javascript.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/javascript.php b/application/config/javascript.php
index 8c4c5f9f1..7b8342ef8 100644
--- a/application/config/javascript.php
+++ b/application/config/javascript.php
@@ -8,5 +8,5 @@ $config['use_bundled_javascript'] = false;
 // systemerror_mailto use in FHC-Alert Plugin - if empty Link will not be rendered
 $config['systemerror_mailto'] = '';
 // use fhcomplete_build_version as path element after public (requires apache mod_rewrite)
-// see <fhc_base_dir>/public/.htaccess for details
+// see <fhc_base_dir>/public/.htaccess_sample for details
 $config['use_fhcomplete_build_version_in_path'] = false;

From 18c949eed4a484739525705be3f788da53a315f3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 3 Feb 2026 13:57:30 +0100
Subject: [PATCH 32/37] refactor tabulator options and events into computed
 section: Tabs Betriebsmittel, Abschlusspruefung, Anrechnungen,
 Aufnahmetermine, Kontakt, Prestudent, Status, bugfix
 Lehrveranstaltungstermine: sorter for Lektor as string

---
 .../Betriebsmittel/Betriebsmittel.js          |  46 +--
 .../Abschlusspruefung/Abschlusspruefung.js    | 162 +++++-----
 .../Details/Anrechnungen/Anrechnungen.js      |  42 ++-
 .../Aufnahmetermine/Aufnahmetermine.js        | 304 +++++++++---------
 .../ListLehrveranstaltungstermine.js          |  36 +--
 .../Details/Prestudent/History.js             |  28 +-
 .../Details/Prestudent/MultiStatus.js         |  84 ++---
 7 files changed, 371 insertions(+), 331 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 148d7a83c..73c413286 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -43,7 +43,22 @@ export default {
 	},
 	data() {
 		return {
-			tabulatorOptions: {
+			listBetriebsmitteltyp: [],
+			formData: {
+				ausgegebenam : new Date(),
+				betriebsmitteltyp: 'Zutrittskarte'
+			},
+			statusNew: true,
+			filteredInventar: [],
+			layout: 'fitColumns',
+			layoutColumnsOnNewData: false,
+			height: '550',
+			persistenceID: 'core-betriebsmittel'
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					this.endpoint.getAllBetriebsmittel(this.typeId, this.id, (this.filterByProvidedTypes ? this.betriebsmittelTypes : null))
@@ -115,7 +130,7 @@ export default {
 										'/content/pdfExport.php?xml=betriebsmittelperson.rdf.php&xsl=Uebernahme&id=' + cellData.betriebsmittelperson_id + '&output=pdf';
 
 									window.open(linkToPdf, '_blank');
-							});
+								});
 							container.append(button);
 
 							button = document.createElement('button');
@@ -143,13 +158,13 @@ export default {
 							return container;
 						},
 						frozen: true
-					}],
-				layout: 'fitColumns',
-				layoutColumnsOnNewData: false,
-				height: '550',
-				persistenceID: 'core-betriebsmittel'
-			},
-			tabulatorEvents: [
+					}
+				],
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async() => {
@@ -193,14 +208,8 @@ export default {
 						});
 					}
 				}
-			],
-			listBetriebsmitteltyp: [],
-			formData: {
-				ausgegebenam : new Date(),
-				betriebsmitteltyp: 'Zutrittskarte'
-			},
-			statusNew: true,
-			filteredInventar: []
+			];
+			return events;
 		}
 	},
 	watch: {
@@ -466,5 +475,4 @@ export default {
 			</template>
 		</bs-modal>
 	</div>`
-}
-
+}
\ 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 d46e1f299..394c8784f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -34,40 +34,58 @@ export default {
 			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];
-		},
-		showAllFormats() {
-			if( this.isBerechtigtDocAndOdt === false
-				|| !Array.isArray(this.isBerechtigtDocAndOdt) )
-			{
-				return false;
-			}
-			let retval = this.isBerechtigtDocAndOdt.includes(this.stgInfo.oe_kurzbz);
-			return retval;
-		}
-	},
 	props: {
 		student: Object
 	},
 	data() {
 		return {
-			tabulatorOptions: {
+			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: [],
+			selectedVorsitz: null,
+			filteredMitarbeiter: [],
+			filteredPersons: [],
+			selectedPruefer1: null,
+			selectedPruefer2: null,
+			selectedPruefer3: null,
+			stgInfo: { typ: '', oe_kurzbz: '' },
+			abortController: {
+				mitarbeiter: null,
+				persons: null
+			},
+			layout: 'fitDataStretchFrozen',
+			layoutColumnsOnNewData: false,
+			height: 'auto',
+			minHeight: '200',
+			index: 'abschlusspruefung_id',
+			persistenceID: 'stv-details-finalexam-2025112401'
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvAbschlusspruefung.getAbschlusspruefung(this.student.uid)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -163,14 +181,11 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataStretchFrozen',
-				layoutColumnsOnNewData: false,
-				height: 'auto',
-				minHeight: '200',
-				index: 'abschlusspruefung_id',
-				persistenceID: 'stv-details-finalexam-2025112401'
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'dataLoaded',
 					handler: data => this.tabulatorData = data.map(item => {
@@ -225,50 +240,36 @@ export default {
 						cm.getColumnByField('abschlusspruefung_id').component.updateDefinition({
 							title: this.$p.t('abschlusspruefung', '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: [],
-			selectedVorsitz: null,
-			filteredMitarbeiter: [],
-			filteredPersons: [],
-			selectedPruefer1: null,
-			selectedPruefer2: null,
-			selectedPruefer3: null,
-			stgInfo: { typ: '', oe_kurzbz: '' },
-			abortController: {
-				mitarbeiter: null,
-				persons: null
-			},
+			];
+			return events;
+		},
+		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];
+		},
+		showAllFormats() {
+			if( this.isBerechtigtDocAndOdt === false
+				|| !Array.isArray(this.isBerechtigtDocAndOdt) )
+			{
+				return false;
+			}
+			let retval = this.isBerechtigtDocAndOdt.includes(this.stgInfo.oe_kurzbz);
+			return retval;
 		}
 	},
 	watch: {
@@ -339,7 +340,7 @@ export default {
 		},
 		getPersonLabel(titelpre, nachname, vorname, titelpost, uid) {
 			return nachname + ' ' + vorname + (titelpre ? ' ' + titelpre : '') + (titelpost ? ' ' + titelpost : '') + (uid ? ' (' + uid + ')' : '');
-				
+
 		},
 		actionDeleteAbschlusspruefung(abschlusspruefung_id) {
 			this.$fhcAlert
@@ -841,4 +842,3 @@ export default {
 	</div>
 `
 }
-
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index a2029b0b9..32224062d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -31,7 +31,24 @@ export default {
 	},
 	data() {
 		return {
-			tabulatorOptions: {
+			formData: {},
+			listBegruendungen: [],
+			listNewLehrveranstaltungen: [],
+			listLektoren: [],
+			listKompatibleLehrveranstaltungen: [],
+			statusNew: true,
+			showNotizen: false,
+			currentAnrechnung_id: null,
+			endpoint: ApiNotizPerson,
+			layout: 'fitDataStretchFrozen',
+			height: '500',
+			index: 'anrechnung_id',
+			persistenceID: 'stv-details-anrechnungen-2025112401'
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					ApiStvExemptions.getAnrechnungen(this.student.prestudent_id)
@@ -107,12 +124,11 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataStretchFrozen',
-				height: '500',
-				index: 'anrechnung_id',
-				persistenceID: 'stv-details-anrechnungen-2025112401'
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -154,16 +170,8 @@ export default {
 
 					}
 				}
-			],
-			formData: {},
-			listBegruendungen: [],
-			listNewLehrveranstaltungen: [],
-			listLektoren: [],
-			listKompatibleLehrveranstaltungen: [],
-			statusNew: true,
-			showNotizen: false,
-			currentAnrechnung_id: null,
-			endpoint: ApiNotizPerson
+			];
+			return events;
 		}
 	},
 	watch: {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index d03569df4..b2ba26a55 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -36,158 +36,19 @@ export default {
 	},
 	data() {
 		return {
-			tabulatorOptions: {
-				ajaxURL: 'dummy',
-				ajaxRequestFunc: () => this.$api.call(
-					ApiStvAdmissionDates.getAufnahmetermine(this.student.person_id)
-				),
-				ajaxResponse: (url, params, response) => response.data,
-				columns: [
-					{title: "rt_id", field: "rt_id", visible: false},
-					{title: "rt_person_id", field: "rt_person_id", visible: false},
-					{title: "person_id", field: "person_id", 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",
-							});
-						}
-					},
-					{title: "stufe", field: "stufe"},
-					{title: "studiensemester", field: "studiensemester"},
-					{title: "anmerkung", field: "anmerkung", visible: false},
-					{title: "anmeldedatum", field: "anmeldedatum", visible: false,
-						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",
-							});
-						}
-					},
-					{title: "punkte", field: "punkte"},
-					{
-						title: "teilgenommen", field: "teilgenommen",
-						formatter: "tickCross",
-						hozAlign: "center",
-						formatterParams: {
-							tickElement: '<i class="fa fa-check text-success"></i>',
-							crossElement: '<i class="fa fa-xmark text-danger"></i>'
-						}
-					},
-					{title: "ort", field: "ort", visible: false},
-					{title: "studienplan", field: "studienplan", visible: false},
-					{title: "studienplan_id", field: "studienplan_id", visible: false},
-					{title: "stg", field: "studiengangkurzbzlang"},
-					{title: "Stg", field: "stg_kuerzel"},
-					{
-						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.actionEditPlacementTest(cell.getData().rt_person_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.actionDeletePlacementTest(cell.getData().rt_person_id)
-							);
-							container.append(button);
-
-							return container;
-						},
-						frozen: true
-					}
-				],
-				layout: 'fitDataStretchFrozen',
-				layoutColumnsOnNewData: false,
-				height: 'auto',
-				minHeight: 200,
-				index: 'aufnahmetermin_id',
-				persistenceID: 'stv-details-table_admission-dates-2025112401'
-			},
-			tabulatorEvents: [
-				{
-					event: 'tableBuilt',
-					handler: async () => {
-						await this.$p.loadCategory(['admission', 'global', 'person', 'ui', 'projektarbeitsbeurteilung']);
-						let cm = this.$refs.table.tabulator.columnManager;
-
-						cm.getColumnByField('rt_id').component.updateDefinition({
-							title: this.$p.t('ui', 'reihungstest_id')
-						});
-						cm.getColumnByField('rt_person_id').component.updateDefinition({
-							title: this.$p.t('ui', 'reihungstest_person_id')
-						});
-						cm.getColumnByField('person_id').component.updateDefinition({
-							title: this.$p.t('person', 'person_id')
-						});
-						cm.getColumnByField('datum').component.updateDefinition({
-							title: this.$p.t('global', 'datum')
-						});
-						cm.getColumnByField('stufe').component.updateDefinition({
-							title: this.$p.t('admission', 'stufe')
-						});
-						cm.getColumnByField('studiensemester').component.updateDefinition({
-							title: this.$p.t('lehre', 'studiensemester')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('anmeldedatum').component.updateDefinition({
-							title: this.$p.t('admission', 'anmeldedatum')
-						});
-						cm.getColumnByField('punkte').component.updateDefinition({
-							title: this.$p.t('exam', 'punkte')
-						});
-						cm.getColumnByField('teilgenommen').component.updateDefinition({
-							title: this.$p.t('admission', 'teilgenommen')
-						});
-						cm.getColumnByField('ort').component.updateDefinition({
-							title: this.$p.t('person', 'ort')
-						});
-						cm.getColumnByField('studienplan').component.updateDefinition({
-							title: this.$p.t('lehre', 'studienplan')
-						});
-						cm.getColumnByField('studienplan_id').component.updateDefinition({
-							title: this.$p.t('ui', 'studienplan_id')
-						});
-						cm.getColumnByField('studiengangkurzbzlang').component.updateDefinition({
-							title: this.$p.t('projektarbeitsbeurteilung', 'studiengang')
-						});
-						cm.getColumnByField('stg_kuerzel').component.updateDefinition({
-							title: this.$p.t('admission', 'stg_kurz')
-						});
-					}
-				}
-			],
 			formData: {},
 			statusNew: true,
 			listPlacementTests: [],
 			listStudyPlans: [],
 			filterOnlyFutureTestsSet: false,
-			filteredPlacementTests: []
+			filteredPlacementTests: [],
+			//data after tabulator data
+			layout: 'fitDataStretchFrozen',
+			layoutColumnsOnNewData: false,
+			height: 'auto',
+			minHeight: 200,
+			index: 'aufnahmetermin_id',
+			persistenceID: 'stv-details-table_admission-dates-2025112401'
 		}
 	},
 	methods: {
@@ -332,6 +193,155 @@ export default {
 			this.formData = {};
 		},
 	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvAdmissionDates.getAufnahmetermine(this.student.person_id)
+				),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "rt_id", field: "rt_id", visible: false},
+					{title: "rt_person_id", field: "rt_person_id", visible: false},
+					{title: "person_id", field: "person_id", 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",
+							});
+						}
+					},
+					{title: "stufe", field: "stufe"},
+					{title: "studiensemester", field: "studiensemester"},
+					{title: "anmerkung", field: "anmerkung", visible: false},
+					{title: "anmeldedatum", field: "anmeldedatum", visible: false,
+						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",
+							});
+						}
+					},
+					{title: "punkte", field: "punkte"},
+					{
+						title: "teilgenommen", field: "teilgenommen",
+						formatter: "tickCross",
+						hozAlign: "center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{title: "ort", field: "ort", visible: false},
+					{title: "studienplan", field: "studienplan", visible: false},
+					{title: "studienplan_id", field: "studienplan_id", visible: false},
+					{title: "stg", field: "studiengangkurzbzlang"},
+					{title: "Stg", field: "stg_kuerzel"},
+					{
+						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.actionEditPlacementTest(cell.getData().rt_person_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.actionDeletePlacementTest(cell.getData().rt_person_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}
+				],
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['admission', 'global', 'person', 'ui', 'projektarbeitsbeurteilung']);
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('rt_id').component.updateDefinition({
+							title: this.$p.t('ui', 'reihungstest_id')
+						});
+						cm.getColumnByField('rt_person_id').component.updateDefinition({
+							title: this.$p.t('ui', 'reihungstest_person_id')
+						});
+						cm.getColumnByField('person_id').component.updateDefinition({
+							title: this.$p.t('person', 'person_id')
+						});
+						cm.getColumnByField('datum').component.updateDefinition({
+							title: this.$p.t('global', 'datum')
+						});
+						cm.getColumnByField('stufe').component.updateDefinition({
+							title: this.$p.t('admission', 'stufe')
+						});
+						cm.getColumnByField('studiensemester').component.updateDefinition({
+							title: this.$p.t('lehre', 'studiensemester')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('anmeldedatum').component.updateDefinition({
+							title: this.$p.t('admission', 'anmeldedatum')
+						});
+						cm.getColumnByField('punkte').component.updateDefinition({
+							title: this.$p.t('exam', 'punkte')
+						});
+						cm.getColumnByField('teilgenommen').component.updateDefinition({
+							title: this.$p.t('admission', 'teilgenommen')
+						});
+						cm.getColumnByField('ort').component.updateDefinition({
+							title: this.$p.t('person', 'ort')
+						});
+						cm.getColumnByField('studienplan').component.updateDefinition({
+							title: this.$p.t('lehre', 'studienplan')
+						});
+						cm.getColumnByField('studienplan_id').component.updateDefinition({
+							title: this.$p.t('ui', 'studienplan_id')
+						});
+						cm.getColumnByField('studiengangkurzbzlang').component.updateDefinition({
+							title: this.$p.t('projektarbeitsbeurteilung', 'studiengang')
+						});
+						cm.getColumnByField('stg_kuerzel').component.updateDefinition({
+							title: this.$p.t('admission', 'stg_kurz')
+						});
+					}
+				}
+			];
+
+			return events;
+		}
+	},
 	created() {
 		this.$api
 			.call(ApiStvAdmissionDates.getListPlacementTests(this.student.prestudent_id))
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index 20cb95fbd..2732a5707 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -11,22 +11,6 @@ export default {
 		FormInput,
 		FormForm
 	},
-	computed: {
-		downloadLink: function(){
-			if(!this.dataSem.start || !this.dataSem.ende || !this.student.uid) return;
-			let start = new Date(this.dataSem.start);
-			start = Math.floor(start.getTime()/1000);
-			let ende = new Date(this.dataSem.ende);
-			ende = Math.floor(ende.getTime() / 1000);
-
-			let link =
-				FHC_JS_DATA_STORAGE_OBJECT.app_root + "cis/private/lvplan/stpl_kalender.php?type=student&pers_uid=" + this.student.uid + "&begin=" + start + "&ende= " +ende + "&format=excel";
-			return link;
-		},
-		dbStundenplanTable: function (){
-			return this.showStundenplanDev ? 'stundenplandev' : 'stundenplan';
-		}
-	},
 	inject: {
 		currentSemester: {
 			from: 'currentSemester',
@@ -44,6 +28,22 @@ export default {
 			showStundenplanDev: false
 		};
 	},
+	computed: {
+		downloadLink: function(){
+			if(!this.dataSem.start || !this.dataSem.ende || !this.student.uid) return;
+			let start = new Date(this.dataSem.start);
+			start = Math.floor(start.getTime()/1000);
+			let ende = new Date(this.dataSem.ende);
+			ende = Math.floor(ende.getTime() / 1000);
+
+			let link =
+				FHC_JS_DATA_STORAGE_OBJECT.app_root + "cis/private/lvplan/stpl_kalender.php?type=student&pers_uid=" + this.student.uid + "&begin=" + start + "&ende= " +ende + "&format=excel";
+			return link;
+		},
+		dbStundenplanTable: function (){
+			return this.showStundenplanDev ? 'stundenplandev' : 'stundenplan';
+		},
+	},
 	methods: {
 		initTabulatorOptions(){
 			this.tabulatorOptions = {
@@ -80,7 +80,7 @@ export default {
 					{title: "farbe", field: "farbe", visible: false},
 					{title: "Gruppen", field: "gruppen_kuerzel"},
 					{title: "ort", field: "ort_kurzbz"},
-					{title: "lektorIn", field: "lektorname"},
+					{title: "lektorIn", field: "lektorname", sorter:"string"},
 					{title: "Lehrfach", field: "lehrfach_bez"}
 				],
 				rowFormatter: function(row){
@@ -135,7 +135,7 @@ export default {
 		},
 		getDatesOfSemester(studiensemester_kurzbz) {
 			this.dataSem = this.listStudiensemester.find(item => item.studiensemester_kurzbz === studiensemester_kurzbz);
-			},
+		},
 		exportToExcel(){
 			window.open(this.downloadLink, '_blank');
 		},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 44b318f5b..1fe96188f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -12,7 +12,16 @@ export default{
 	},
 	data() {
 		return {
-			tabulatorOptions: {
+			layout: 'fitDataFill',
+			layoutColumnsOnNewData:	false,
+			height:	'auto',
+			selectable:	false,
+			persistenceID: 'stv-details-prestudent-history',
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvPrestudent.getHistoryPrestudents(this.personId)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -37,13 +46,11 @@ export default{
 						element.classList.add('fw-bold');
 					}
 				},
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData:	false,
-				height:	'auto',
-				selectable:	false,
-				persistenceID: 'stv-details-prestudent-history'
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -64,8 +71,9 @@ export default{
 						});
 					}
 				}
-			]
-		}
+			];
+			return events;
+		},
 	},
 	watch: {
 		personId() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index e67f19ccf..8f381c330 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -26,37 +26,8 @@ export default{
 		}
 	},
 	computed: {
-		prestudentIds() {
-			if (this.modelValue.prestudent_id)
-			{
-				return [this.modelValue.prestudent_id];
-			}
-			return this.modelValue.map(e => e.prestudent_id);
-		},
-		showToolbarStudent() {
-			if (Array.isArray(this.modelValue)) {
-				if (!this.modelValue.length)
-					return false;
-				return this.modelValue.every(item => item.uid);
-			}
-			return !!this.modelValue.uid;
-		},
-		showToolbarInteressent() {
-			if (Array.isArray(this.modelValue)) {
-				if (!this.modelValue.length)
-					return false;
-				return !this.modelValue.some(item => item.uid);
-			}
-			return !this.modelValue.uid;
-		}
-	},
-	props: {
-		modelValue: Object,
-		config: Object,
-	},
-	data() {
-		return {
-			tabulatorOptions: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvPrestudent.getHistoryPrestudent(this.modelValue.prestudent_id)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -164,7 +135,7 @@ export default{
 						}
 					},
 					{title: "UpdateVon", field: "updatevon", visible: false},
-/*					{title: "Aufnahmestufe", field: "aufnahmestufe", visible: false},*/
+					/*					{title: "Aufnahmestufe", field: "aufnahmestufe", visible: false},*/
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -207,8 +178,8 @@ export default{
 							button.addEventListener('click', () =>
 								this.actionEditStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester)
 							);
-/*							if (this.dataMeldestichtag && this.dataMeldestichtag > data.datum && !this.hasPermissionToSkipStatusCheck)
-								button.disabled = true;*/
+							/*							if (this.dataMeldestichtag && this.dataMeldestichtag > data.datum && !this.hasPermissionToSkipStatusCheck)
+															button.disabled = true;*/
 							container.append(button);
 
 							button = document.createElement('button');
@@ -240,8 +211,11 @@ export default{
 				selectable: false,
 				index: 'statusId',
 				persistenceID: 'stv-multistatus-2025112401'
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -250,8 +224,8 @@ export default{
 						let cm = this.$refs.table.tabulator.columnManager;
 
 						cm.getColumnByField('lehrverband').component.updateDefinition({
-									title: this.$p.t('lehre', 'lehrverband')
-								});
+							title: this.$p.t('lehre', 'lehrverband')
+						});
 
 						cm.getColumnByField('bestaetigtam').component.updateDefinition({
 							title: this.$p.t('lehre', 'bestaetigt_am')
@@ -298,7 +272,39 @@ export default{
 						});
 					}
 				}
-			],
+			];
+			return events;
+		},
+		prestudentIds() {
+			if (this.modelValue.prestudent_id)
+			{
+				return [this.modelValue.prestudent_id];
+			}
+			return this.modelValue.map(e => e.prestudent_id);
+		},
+		showToolbarStudent() {
+			if (Array.isArray(this.modelValue)) {
+				if (!this.modelValue.length)
+					return false;
+				return this.modelValue.every(item => item.uid);
+			}
+			return !!this.modelValue.uid;
+		},
+		showToolbarInteressent() {
+			if (Array.isArray(this.modelValue)) {
+				if (!this.modelValue.length)
+					return false;
+				return !this.modelValue.some(item => item.uid);
+			}
+			return !this.modelValue.uid;
+		}
+	},
+	props: {
+		modelValue: Object,
+		config: Object,
+	},
+	data() {
+		return {
 			statusData: {},
 			statusId: {},
 			dataMeldestichtag: null,

From 87ff7acef0c20f3e680ead47760b7e005b67bd8e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Feb 2026 14:27:02 +0100
Subject: [PATCH 33/37] use absoluteJsImportUrl helper instead of APP_ROOT
 constant to build js components file path

---
 application/controllers/api/frontend/v1/lv/Setup.php   | 8 ++++----
 application/controllers/api/frontend/v1/stv/Config.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/lv/Setup.php b/application/controllers/api/frontend/v1/lv/Setup.php
index a2c167dd6..eea4befa5 100644
--- a/application/controllers/api/frontend/v1/lv/Setup.php
+++ b/application/controllers/api/frontend/v1/lv/Setup.php
@@ -47,22 +47,22 @@ class Setup extends FHCAPI_Controller
 	{
 		$tabs['details'] = array (
 			'title' =>  'Details',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Details.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Details.js'),
 			'config' => []
 		);
 		$tabs['gruppen'] = array (
 			'title' =>  'Gruppen',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Gruppen.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Gruppen.js'),
 			'config' => []
 		);
 		$tabs['lektor'] = array (
 			'title' =>  'LektorInnenzuteilung',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Lektor.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Lektor.js'),
 			'config' => []
 		);
 		$tabs['notiz'] = array (
 			'title' =>  'Notizen',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Notiz.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Notiz.js'),
 			'config' => []
 		);
 		$this->terminateWithSuccess($tabs);
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 17b360f8c..c787381f0 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -504,7 +504,7 @@ class Config extends FHCAPI_Controller
 		{
 			$result['combinePeople'] = [
 				'title' => $this->p->t('stv', 'tab_combine_people'),
-				'component' => './Stv/Studentenverwaltung/Details/CombinePeople.js',
+				'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js'),
 				'config' => $config['combinePeople']
 			];
 		}

From e0082db7c99742fa2e4149d3f2f50e7a4c996338 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 3 Feb 2026 16:16:18 +0100
Subject: [PATCH 34/37] Tab Aufnahmetermine: add context self to computed
 properties and adapt name of 2 variables, Tab Lehrveranstaltungstermine: add
 space

---
 .../Details/Aufnahmetermine/Aufnahmetermine.js             | 7 ++++---
 .../ListLehrveranstaltungstermine.js                       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 775b94364..81b55983f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -211,6 +211,8 @@ export default {
 	},
 	computed: {
 		tabulatorOptions() {
+			const self = this;
+
 			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
@@ -236,7 +238,6 @@ export default {
 				},
 				rowFormatter: function(row) {
 					let data = row.getData();
-
 					if (data.studiengang_kz_ber === self.student.studiengang_kz &&
 						data.studiensemester === self.youngestSemester) {
 						let cells = row.getCells();
@@ -378,10 +379,10 @@ export default {
 						cm.getColumnByField('studienplan_id').component.updateDefinition({
 							title: this.$p.t('ui', 'studienplan_id')
 						});
-						cm.getColumnByField('studiengangkurzbzlang').component.updateDefinition({
+						cm.getColumnByField('studiengangkurzbzlang_ber').component.updateDefinition({
 							title: this.$p.t('projektarbeitsbeurteilung', 'studiengang')
 						});
-						cm.getColumnByField('stg_kuerzel').component.updateDefinition({
+						cm.getColumnByField('studiengang_kz_ber').component.updateDefinition({
 							title: this.$p.t('admission', 'stg_kurz')
 						});
 					}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index 2732a5707..5b0c4e350 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -80,7 +80,7 @@ export default {
 					{title: "farbe", field: "farbe", visible: false},
 					{title: "Gruppen", field: "gruppen_kuerzel"},
 					{title: "ort", field: "ort_kurzbz"},
-					{title: "lektorIn", field: "lektorname", sorter:"string"},
+					{title: "lektorIn", field: "lektorname", sorter: "string"},
 					{title: "Lehrfach", field: "lehrfach_bez"}
 				],
 				rowFormatter: function(row){

From 30532891461716fcdcb4826519b3dd7abf515748 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 4 Feb 2026 11:33:54 +0100
Subject: [PATCH 35/37] Filter: change type filter Active, change position
 filter item, default values All Buchungstypen

---
 application/controllers/api/frontend/v1/stv/Config.php      | 6 ++++--
 public/js/components/Stv/Studentenverwaltung/List.js        | 2 +-
 public/js/components/Stv/Studentenverwaltung/List/Filter.js | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 17b360f8c..d633aefa2 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -200,7 +200,8 @@ class Config extends FHCAPI_Controller
 					'type' => 'select',
 					'values' => $buchungstyp_kurzbz_plus_all,
 					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung'
+					'label_key' => 'beschreibung',
+					'default' => 'all'
 				],
 				'samestg' => [
 					'type' => 'bool',
@@ -226,7 +227,8 @@ class Config extends FHCAPI_Controller
 					'type' => 'select',
 					'values' => $buchungstyp_kurzbz_plus_all,
 					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung'
+					'label_key' => 'beschreibung',
+					'default' => 'all'
 				],
 				'samestg' => [
 					'type' => 'bool',
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 835bf9fec..c70d8de64 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -578,7 +578,7 @@ export default {
 			</template>
 
 			<template #actions v-if="filter.length">
-			  <div class="d-flex align-items-center gap-2 ps-4">
+			  <div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
 				<p class="text-danger mb-0">
 				  <strong>{{$p.t('filter','filterActive')}}</strong>
 				</p>
diff --git a/public/js/components/Stv/Studentenverwaltung/List/Filter.js b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
index cc995523e..6fef5d6c5 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/Filter.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
@@ -8,7 +8,7 @@ export default {
 		FilterItem
 	},
 	props: {
-		filterActive: Boolean,
+		filterActive: Number,
 	},
 	emits: [
 		'change'

From ee619004bd2d31bb9d4f184659752b51a8254ec6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 5 Feb 2026 09:41:15 +0100
Subject: [PATCH 36/37] refactor tabulatorevents to avoid updateDefinitions
 (Tabs Betriebsmittel, Funktionen, Messages, Notizen, Abschlusspruefung,
 Anrechnungen, Aufnahmetermine, Dokumente, Kontakt, Lehrveranstaltungstermine,
 Mobility, Prestudent, Pruefungen)

---
 .../Betriebsmittel/Betriebsmittel.js          |  59 ++++----
 public/js/components/Funktionen/Funktionen.js |  76 +++++-----
 .../Messages/Details/TableMessages.js         |  69 ++++-----
 public/js/components/Notiz/Notiz.js           |  83 ++++-------
 .../Abschlusspruefung/Abschlusspruefung.js    |  70 ++++-----
 .../Details/Anrechnungen/Anrechnungen.js      |  59 ++++----
 .../Aufnahmetermine/Aufnahmetermine.js        |  79 ++++-------
 .../Details/Dokumente/List/Accepted.js        |  71 ++++------
 .../Details/Dokumente/List/Unaccepted.js      |  57 ++++----
 .../Details/JointStudies/JointStudies.js      | 101 ++++++-------
 .../Details/Kontakt/Address.js                |  88 +++++-------
 .../Details/Kontakt/Bankaccount.js            |  46 +++---
 .../Details/Kontakt/Contact.js                |  34 ++++-
 .../ListLehrveranstaltungstermine.js          |  50 +++----
 .../Details/Mobility/Mobility.js              |  39 ++---
 .../Details/Prestudent/History.js             |   4 +-
 .../Details/Pruefung/Pruefunglist.js          | 134 +++++++++---------
 17 files changed, 492 insertions(+), 627 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 73c413286..686caa1ac 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -53,7 +53,6 @@ export default {
 			layout: 'fitColumns',
 			layoutColumnsOnNewData: false,
 			height: '550',
-			persistenceID: 'core-betriebsmittel'
 		}
 	},
 	computed: {
@@ -64,6 +63,7 @@ export default {
 					this.endpoint.getAllBetriebsmittel(this.typeId, this.id, (this.filterByProvidedTypes ? this.betriebsmittelTypes : null))
 				),
 				ajaxResponse: (url, params, response) => response.data,
+				persistenceID: 'core-betriebsmittel',
 				columns: [
 					{title: "Nummer", field: "nummer", width: 150},
 					{title: "PersonId", field: "person_id", visible: false},
@@ -171,41 +171,30 @@ export default {
 
 						await this.$p.loadCategory(['wawi', 'global', 'infocenter', 'betriebsmittel', 'person']);
 
-						let cm = this.$refs.table.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('nummer').component.updateDefinition({
-							title: this.$p.t('wawi', 'nummer')
-						});
-						cm.getColumnByField('betriebsmitteltyp').component.updateDefinition({
-							title: this.$p.t('global', 'typ')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('retouram').component.updateDefinition({
-							title: this.$p.t('wawi', 'retourdatum')
-						});
-						cm.getColumnByField('beschreibung').component.updateDefinition({
-							title: this.$p.t('global', 'beschreibung')
-						});
-						cm.getColumnByField('kaution').component.updateDefinition({
-							title: this.$p.t('infocenter', 'kaution')
-						});
-						cm.getColumnByField('ausgegebenam').component.updateDefinition({
-							title: this.$p.t('wawi', 'ausgabedatum')
-						});
-						cm.getColumnByField('betriebsmittel_id').component.updateDefinition({
-							title: this.$p.t('ui', 'betriebsmittel_id')
-						});
-						cm.getColumnByField('betriebsmittelperson_id').component.updateDefinition({
-							title: this.$p.t('ui', 'betriebsmittelperson_id')
-						});
-						cm.getColumnByField('person_id').component.updateDefinition({
-							title: this.$p.t('person', 'person_id')
-						});
-						cm.getColumnByField('uid').component.updateDefinition({
-							title: this.$p.t('person', 'uid')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('nummer', this.$p.t('wawi', 'nummer'));
+						setHeader('betriebsmitteltyp', this.$p.t('global', 'typ'));
+						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
+						setHeader('retouram', this.$p.t('wawi', 'retourdatum'));
+						setHeader('beschreibung', this.$p.t('global', 'beschreibung'));
+						setHeader('kaution', this.$p.t('infocenter', 'kaution'));
+						setHeader('ausgegebenam', this.$p.t('wawi', 'ausgabedatum'));
+						setHeader('betriebsmittel_id', this.$p.t('ui', 'betriebsmittel_id'));
+						setHeader('betriebsmittelperson_id', this.$p.t('ui', 'betriebsmittelperson_id'));
+						setHeader('person_id', this.$p.t('person', 'person_id'));
+						setHeader('uid', this.$p.t('person', 'uid'));
 					}
 				}
 			];
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 568a74c91..170747e5f 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -60,8 +60,7 @@ export default {
 			selectedOe: null,
 			layout: 'fitDataFill',
 			layoutColumnsOnNewData: false,
-			height: '300',
-			persistenceID: 'core-functions',
+			height: '300'
 		}
 	},
 	computed: {
@@ -72,20 +71,33 @@ export default {
 					ApiCoreFunktion.getAllUserFunctions(this.personUID)
 				),
 				ajaxResponse: (url, params, response) => response.data,
+				persistenceID: 'core-functions',
 				columns: [
 					{
 						title: "dienstverhaeltnis_unternehmen",
 						field: "dienstverhaeltnis_unternehmen",
 						headerFilter: "list",
-						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"},
+						headerFilterParams: {
+							valuesLookup: true, autocomplete: true, sort: "asc"
+						},
+						width: 140,
+						//Field Company: if visible show link to dv
+						visible: this.showDvCompany,
+						formatter: this.companyLinkFormatter
 					},
 					{
 						title: "funktion_beschreibung", field: "funktion_beschreibung", headerFilter: "list",
-						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"},
+						headerFilterParams: {
+							valuesLookup: true, autocomplete: true, sort: "asc"
+						},
+						width: 140
 					},
 					{
 						title: "funktion_oebezeichnung", field: "funktion_oebezeichnung", headerFilter: "list",
-						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"}
+						headerFilterParams: {
+							valuesLookup: true, autocomplete: true, sort: "asc"
+						},
+						width: 140
 					},
 					{title: "wochenstunden", field: "wochenstunden", headerFilter: true},
 					{
@@ -120,7 +132,7 @@ export default {
 							});
 						},
 					},
-					{title: "bezeichnung", field: "bezeichnung", headerFilter: true},
+					{title: "bezeichnung", field: "bezeichnung", headerFilter: true, width: 140},
 					{title: "aktiv", field: "aktiv", visible: false},
 					{title: "benutzerfunktion_id", field: "benutzerfunktion_id", visible: false},
 					{title: "uid", field: "uid", visible: false},
@@ -184,47 +196,27 @@ export default {
 					event: 'tableBuilt',
 					handler: async () => {
 						await this.$p.loadCategory(['global', 'lehre', 'person', 'ui']);
-						let cm = this.$refs.table.tabulator.columnManager;
 
-						//Field Company: if visible show link to dv
-						const column = cm.getColumnByField('dienstverhaeltnis_unternehmen');
-						const companyDv = {
-							title: this.$p.t('person', 'dv_unternehmen'),
-							width: 140,
-							visible: this.showDvCompany,
-							formatter: this.companyLinkFormatter
-						};
-						column.component.updateDefinition(companyDv);
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('funktion_beschreibung').component.updateDefinition({
-							title: this.$p.t('person', 'zuordnung_taetigkeit'),
-							width: 140
-						});
-						cm.getColumnByField('funktion_oebezeichnung').component.updateDefinition({
-							title: this.$p.t('lehre', 'organisationseinheit'),
-							width: 140
-						});
-						cm.getColumnByField('wochenstunden').component.updateDefinition({
-							title: this.$p.t('person', 'wochenstunden')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
-						const columnDatumVon = cm.getColumnByField('datum_von');
-						const fieldVonDatum = {
-							title: this.$p.t('ui', 'from')
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
 						};
 
-						columnDatumVon.component.updateDefinition(fieldVonDatum);
-
-						const columnDatumBis = cm.getColumnByField('datum_bis');
-						const fieldBisDatum = {
-							title: this.$p.t('global', 'bis'),
-						};
-						columnDatumBis.component.updateDefinition(fieldBisDatum);
-
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('ui', 'bezeichnung'),
-							width: 140
-						});
+						setHeader('dienstverhaeltnis_unternehmen', this.$p.t('person', 'dv_unternehmen'));
+						setHeader('funktion_beschreibung', this.$p.t('person', 'zuordnung_taetigkeit'));
+						setHeader('funktion_oebezeichnung', this.$p.t('lehre', 'organisationseinheit'));
+						setHeader('wochenstunden', this.$p.t('person', 'wochenstunden'));
+						setHeader('datum_von', this.$p.t('ui', 'from'));
+						setHeader('datum_bis', this.$p.t('global', 'bis'));
+						setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
 					}
 				}
 			];
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 05484090a..afcdf0d5c 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -28,13 +28,10 @@ export default {
 			previewBody: "",
 			open: false,
 			personId: null,
-			layout: 'fitDataStretchFrozen',
 			layoutColumnsOnNewData:	false,
 			height: '400',
-			persistenceID: 'core-message-2025112401',
 			selectable: 1,
 			selectableRangeMode: 'click',
-			index: 'message_id',
 		}
 	},
 	methods: {
@@ -131,6 +128,9 @@ export default {
 					};
 				},
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
+				layout: 'fitDataStretchFrozen',
+				index: 'message_id',
+				persistenceID: 'core-message-2025112401',
 				columns: [
 					{title: "subject", field: "subject", headerFilter: true},
 					{title: "body", field: "body", formatter: "html", visible: false, headerFilter: true},
@@ -178,8 +178,12 @@ export default {
 							"archived",
 							"deleted"
 						],
-						formatter: (cell, formatterParams) => {
+/*						formatter: (cell, formatterParams) => {
 							return formatterParams[cell.getValue()];
+						},*/
+						formatter: (cell, formatterParams) => {
+							const key = formatterParams[cell.getValue()];
+							return this.$p.t('messages', key);
 						},
 					},
 					{
@@ -291,44 +295,29 @@ export default {
 					handler: async() => {
 						await this.$p.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz']);
 
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						let cm = this.$refs.table.tabulator.columnManager;
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('subject', this.$p.t('global', 'betreff'));
+						setHeader('body', this.$p.t('messages', 'body'));
+						setHeader('message_id', this.$p.t('messages', 'message_id'));
+						setHeader('insertamum', this.$p.t('global', 'datum'));
+						setHeader('sender', this.$p.t('messages', 'sender'));
+						setHeader('recipient', this.$p.t('messages', 'recipient'));
+						setHeader('sender_id', this.$p.t('messages', 'senderId'));
+						setHeader('recipient_id', this.$p.t('messages', 'recipientId'));
+						setHeader('statusdatum', this.$p.t('notiz', 'letzte_aenderung'));
 
-						cm.getColumnByField('subject').component.updateDefinition({
-							title: this.$p.t('global', 'betreff')
-						});
-						cm.getColumnByField('body').component.updateDefinition({
-							title: this.$p.t('messages', 'body')
-						});
-						cm.getColumnByField('message_id').component.updateDefinition({
-							title: this.$p.t('messages', 'message_id')
-						});
-						cm.getColumnByField('insertamum').component.updateDefinition({
-							title: this.$p.t('global', 'datum')
-						});
-						cm.getColumnByField('sender').component.updateDefinition({
-							title: this.$p.t('messages', 'sender')
-						});
-						cm.getColumnByField('recipient').component.updateDefinition({
-							title: this.$p.t('messages', 'recipient')
-						});
-						cm.getColumnByField('sender_id').component.updateDefinition({
-							title: this.$p.t('messages', 'senderId')
-						});
-						cm.getColumnByField('recipient_id').component.updateDefinition({
-							title: this.$p.t('messages', 'recipientId')
-						});
-						cm.getColumnByField('statusdatum').component.updateDefinition({
-							title: this.$p.t('notiz', 'letzte_aenderung')
-						});
-						cm.getColumnByField('status').component.updateDefinition({
-							formatterParams: [
-								this.$p.t('messages/unread'),
-								this.$p.t('messages/read'),
-								this.$p.t('messages/archived'),
-								this.$p.t('messages/deleted')
-							]
-						});
 						this.$refs.table.tabulator.rowManager.getDisplayRows();
 					}
 				},
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 0119b0a77..33865f981 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -227,7 +227,7 @@ export default {
 				index: 'notiz_id',
 				persistenceID: this.tabulatorPersistenceId,
 				persistence: {
-					sort: false,
+					sort: true,
 					columns: ["width", "visible", "frozen"],
 					filter: false,
 					headerFilter: false,
@@ -242,62 +242,39 @@ export default {
 					event: 'tableBuilt',
 					handler: async () => {
 
+						//to avoid js error
+						if (!this.$refs.table) return;
+
 						await this.$p.loadCategory(['notiz', 'global', 'ui']);
 
-						let cm = this.$refs.table.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('verfasser').component.updateDefinition({
-							title: this.$p.t('notiz', 'verfasser'),
-						});
-						cm.getColumnByField('verfasser_uid').component.updateDefinition({
-							title: this.$p.t('ui', 'verfasser_uid'),
-						});
-						cm.getColumnByField('titel').component.updateDefinition({
-							title: this.$p.t('global', 'titel'),
-						});
-						cm.getColumnByField('bearbeiter').component.updateDefinition({
-							title: this.$p.t('notiz', 'bearbeiter'),
-						});
-						cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
-							title: this.$p.t('ui', 'bearbeiter_uid'),
-						});
-						cm.getColumnByField('start_format').component.updateDefinition({
-							title: this.$p.t('global', 'gueltigVon'),
-						});
-						cm.getColumnByField('ende_format').component.updateDefinition({
-							title: this.$p.t('global', 'gueltigBis'),
-						});
-						cm.getColumnByField('countdoc').component.updateDefinition({
-							title: this.$p.t('notiz', 'document'),
-						});
-						cm.getColumnByField('erledigt').component.updateDefinition({
-							title: this.$p.t('notiz', 'erledigt'),
-						});
-						cm.getColumnByField('lastupdate').component.updateDefinition({
-							title: this.$p.t('notiz', 'letzte_aenderung'),
-						});
-						cm.getColumnByField('notiz_id').component.updateDefinition({
-							title: this.$p.t('ui', 'notiz_id')
-						});
-						cm.getColumnByField('notizzuordnung_id').component.updateDefinition({
-							title: this.$p.t('ui', 'notizzuordnung_id')
-						});
-						cm.getColumnByField('type_id').component.updateDefinition({
-							title: this.$p.t('ui', 'type_id')
-						});
-						cm.getColumnByField('id').component.updateDefinition({
-							title: this.$p.t('ui', 'extension_id')
-						});
-						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
-						cm.getColumnByField('text_stripped').component.updateDefinition({
-							title: this.$p.t('global', 'text'),
-							width: 250,
-							tooltip: true,
-							//clipContents: true,
-						});
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('verfasser', this.$p.t('notiz', 'verfasser'));
+						setHeader('verfasser_uid', this.$p.t('ui', 'verfasser_uid'));
+						setHeader('titel', this.$p.t('global', 'titel'));
+						setHeader('bearbeiter', this.$p.t('notiz', 'bearbeiter'));
+						setHeader('bearbeiter_uid', this.$p.t('ui', 'bearbeiter_uid'));
+						setHeader('start_format', this.$p.t('global', 'gueltigVon'));
+						setHeader('ende_format', this.$p.t('global', 'gueltigBis'));
+						setHeader('countdoc', this.$p.t('notiz', 'document'));
+						setHeader('erledigt', this.$p.t('notiz', 'erledigt'));
+						setHeader('lastupdate', this.$p.t('notiz', 'letzte_aenderung'));
+						setHeader('notiz_id', this.$p.t('ui', 'notiz_id'));
+						setHeader('notizzuordnung_id', this.$p.t('ui', 'notizzuordnung_id'));
+						setHeader('type_id', this.$p.t('ui', 'type_id'));
+						setHeader('id', this.$p.t('ui', 'extension_id'));
+						setHeader('text_stripped', this.$p.t('global', 'text'));
 
 						// Force layout recalculation for handling overflow text
 						this.$refs.table.tabulator.redraw(true);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 394c8784f..7724c5fed 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -79,8 +79,6 @@ export default {
 			layoutColumnsOnNewData: false,
 			height: 'auto',
 			minHeight: '200',
-			index: 'abschlusspruefung_id',
-			persistenceID: 'stv-details-finalexam-2025112401'
 		}
 	},
 	computed: {
@@ -89,6 +87,8 @@ export default {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvAbschlusspruefung.getAbschlusspruefung(this.student.uid)),
 				ajaxResponse: (url, params, response) => response.data,
+				index: 'abschlusspruefung_id',
+				persistenceID: 'stv-details-finalexam-2025112401',
 				columns: [
 					{title: "vorsitz", field: "vorsitz_nachname"},
 					{title: "abschlussbeurteilung", field: "beurteilung_bezeichnung"},
@@ -196,50 +196,36 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
+						if (!this.$refs.table) return;
+
 						await this.$p.loadCategory(['global', 'person', 'stv', 'abschlusspruefung', 'ui']);
 
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						let cm = this.$refs.table.tabulator.columnManager;
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
-						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('abschlusspruefung', 'abschlusspruefung_id')
-						});
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('vorsitz_nachname', this.$p.t('abschlusspruefung', 'vorsitz_header'));
+						setHeader('beurteilung_bezeichnung', this.$p.t('abschlusspruefung', 'abschlussbeurteilung'));
+						setHeader('p1_nachname', this.$p.t('abschlusspruefung', 'pruefer1'));
+						setHeader('p2_nachname', this.$p.t('abschlusspruefung', 'pruefer2'));
+						setHeader('p3_nachname', this.$p.t('abschlusspruefung', 'pruefer3'));
+						setHeader('datum', this.$p.t('global', 'datum'));
+						setHeader('uhrzeit', this.$p.t('global', 'uhrzeit'));
+						setHeader('freigabedatum', this.$p.t('abschlusspruefung', 'freigabe'));
+						setHeader('antritt_bezeichnung', this.$p.t('abschlusspruefung', 'pruefungsantritt'));
+						setHeader('sponsion', this.$p.t('abschlusspruefung', 'sponsion'));
+						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
+						setHeader('pruefungstyp_kurzbz', this.$p.t('global', 'typ'));
+						setHeader('abschlusspruefung_id', this.$p.t('abschlusspruefung', 'abschlusspruefung_id'));
 					}
 				}
 			];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 32224062d..88392337b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -40,10 +40,6 @@ export default {
 			showNotizen: false,
 			currentAnrechnung_id: null,
 			endpoint: ApiNotizPerson,
-			layout: 'fitDataStretchFrozen',
-			height: '500',
-			index: 'anrechnung_id',
-			persistenceID: 'stv-details-anrechnungen-2025112401'
 		}
 	},
 	computed: {
@@ -54,6 +50,10 @@ export default {
 					ApiStvExemptions.getAnrechnungen(this.student.prestudent_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
+				layout: 'fitDataStretchFrozen',
+				height: '500',
+				index: 'anrechnung_id',
+				persistenceID: 'stv-details-anrechnungen-2025112401',
 				columns: [
 					{title: "anrechnung_id", field: "anrechnung_id", visible: false},
 					{title: "lehrveranstaltung_id", field: "lehrveranstaltung_id", visible: false},
@@ -135,39 +135,28 @@ export default {
 
 						await this.$p.loadCategory(['anrechnungen', 'global', 'ui', 'lehre']);
 
-						let cm = this.$refs.table.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('anrechnung_id').component.updateDefinition({
-							title: this.$p.t('ui', 'anrechnung_id'),
-						});
-						cm.getColumnByField('lehrveranstaltung_id').component.updateDefinition({
-							title: this.$p.t('lehre', 'lehrveranstaltung_id'),
-						});
-						cm.getColumnByField('bez_lehrveranstaltung').component.updateDefinition({
-							title: this.$p.t('lehre', 'lehrveranstaltung'),
-						});
-						cm.getColumnByField('begruendung').component.updateDefinition({
-							title: this.$p.t('global', 'begruendung'),
-						});
-						cm.getColumnByField('lehrveranstaltung_id_kompatibel').component.updateDefinition({
-							title: this.$p.t('anrechnung', 'lehrveranstaltung_id_kompatibel'),
-						});
-						cm.getColumnByField('lehrveranstaltung_bez_kompatibel').component.updateDefinition({
-							title: this.$p.t('anrechnung', 'lehrveranstaltung_bez_kompatibel'),
-						});
-						cm.getColumnByField('status').component.updateDefinition({
-							title: this.$p.t('global', 'status'),
-						});
-						cm.getColumnByField('genehmigt_von').component.updateDefinition({
-							title: this.$p.t('anrechnung', 'genehmigtVon'),
-						});
-						cm.getColumnByField('notizen_anzahl').component.updateDefinition({
-							title: this.$p.t('anrechnung', 'existingNotes'),
-						});
-						cm.getColumnByField('insertamum').component.updateDefinition({
-							title: this.$p.t('global', 'datum'),
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+						setHeader(	'anrechnung_id', this.$p.t('ui', 'anrechnung_id'));
+						setHeader(	'lehrveranstaltung_id', this.$p.t('lehre', 'lehrveranstaltung_id'));
+						setHeader(	'bez_lehrveranstaltung', this.$p.t('lehre', 'lehrveranstaltung'));
+						setHeader(	'begruendung', this.$p.t('global', 'begruendung'));
+						setHeader(	'lehrveranstaltung_id_kompatibel', this.$p.t('anrechnung', 'lehrveranstaltung_id_kompatibel'));
+						setHeader(	'lehrveranstaltung_bez_kompatibel', this.$p.t('anrechnung', 'lehrveranstaltung_bez_kompatibel'));
+						setHeader(	'status', this.$p.t('global', 'status'));
+						setHeader(	'genehmigt_von', this.$p.t('anrechnung', 'genehmigtVon'));
+						setHeader(	'notizen_anzahl', this.$p.t('anrechnung', 'existingNotes'));
+						setHeader(	'insertamum', this.$p.t('global', 'datum'));
 					}
 				}
 			];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 81b55983f..48a7e3d4f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -52,9 +52,7 @@ export default {
 			layout: 'fitDataStretchFrozen',
 			layoutColumnsOnNewData: false,
 			height: 'auto',
-			minHeight: 200,
-			index: 'aufnahmetermin_id',
-			persistenceID: 'stv-details-table_admission-dates-2025112401'
+			minHeight: 200
 		}
 	},
 	methods: {
@@ -250,6 +248,8 @@ export default {
 				dataLoaded: function() {
 					this.redraw(true);
 				},
+				index: 'aufnahmetermin_id',
+				persistenceID: 'stv-details-table_admission-dates-2025112401',
 				columns: [
 					{title: "rt_id", field: "rt_id", visible: false},
 					{title: "rt_person_id", field: "rt_person_id", visible: false},
@@ -338,53 +338,34 @@ export default {
 					event: 'tableBuilt',
 					handler: async () => {
 						await this.$p.loadCategory(['admission', 'global', 'person', 'ui', 'projektarbeitsbeurteilung']);
-						let cm = this.$refs.table.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('rt_id').component.updateDefinition({
-							title: this.$p.t('ui', 'reihungstest_id')
-						});
-						cm.getColumnByField('rt_person_id').component.updateDefinition({
-							title: this.$p.t('ui', 'reihungstest_person_id')
-						});
-						cm.getColumnByField('person_id').component.updateDefinition({
-							title: this.$p.t('person', 'person_id')
-						});
-						cm.getColumnByField('datum').component.updateDefinition({
-							title: this.$p.t('global', 'datum')
-						});
-						cm.getColumnByField('stufe').component.updateDefinition({
-							title: this.$p.t('admission', 'stufe')
-						});
-						cm.getColumnByField('studiensemester').component.updateDefinition({
-							title: this.$p.t('lehre', 'studiensemester')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('anmeldedatum').component.updateDefinition({
-							title: this.$p.t('admission', 'anmeldedatum')
-						});
-						cm.getColumnByField('punkte').component.updateDefinition({
-							title: this.$p.t('exam', 'punkte')
-						});
-						cm.getColumnByField('teilgenommen').component.updateDefinition({
-							title: this.$p.t('admission', 'teilgenommen')
-						});
-						cm.getColumnByField('ort').component.updateDefinition({
-							title: this.$p.t('person', 'ort')
-						});
-						cm.getColumnByField('studienplan').component.updateDefinition({
-							title: this.$p.t('lehre', 'studienplan')
-						});
-						cm.getColumnByField('studienplan_id').component.updateDefinition({
-							title: this.$p.t('ui', 'studienplan_id')
-						});
-						cm.getColumnByField('studiengangkurzbzlang_ber').component.updateDefinition({
-							title: this.$p.t('projektarbeitsbeurteilung', 'studiengang')
-						});
-						cm.getColumnByField('studiengang_kz_ber').component.updateDefinition({
-							title: this.$p.t('admission', 'stg_kurz')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('rt_id', this.$p.t('ui', 'reihungstest_id'));
+						setHeader('rt_person_id', this.$p.t('ui', 'reihungstest_person_id'));
+						setHeader('person_id', this.$p.t('person', 'person_id'));
+						setHeader('datum', this.$p.t('global', 'datum'));
+						setHeader('stufe', this.$p.t('admission', 'stufe'));
+						setHeader('studiensemester', this.$p.t('lehre', 'studiensemester'));
+						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
+						setHeader('anmeldedatum', this.$p.t('admission', 'anmeldedatum'));
+						setHeader('punkte', this.$p.t('exam', 'punkte'));
+						setHeader('teilgenommen', this.$p.t('admission', 'teilgenommen'));
+						setHeader('ort', this.$p.t('person', 'ort'));
+						setHeader('studienplan', this.$p.t('lehre', 'studienplan'));
+						setHeader('studienplan_id', this.$p.t('ui', 'studienplan_id'));
+						setHeader('studiengangkurzbzlang_ber', this.$p.t('projektarbeitsbeurteilung', 'studiengang'));
+						setHeader('studiengang_kz_ber', this.$p.t('admission', 'stg_kurz'));
 					}
 				}
 			];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index 46029a5d3..f70e44392 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -18,12 +18,9 @@ export default {
 	data(){
 		return {
 			listDocuments: [],
-			layout: 'fitDataStretchFrozen',
 			layoutColumnsOnNewData: false,
 			height: 300,
 			selectable: true,
-			selectableRangeMode: 'click',
-			persistenceID: 'core-details-documents-accepted-2025072101',
 		}
 	},
 	computed: {
@@ -38,7 +35,12 @@ export default {
 				ajaxResponse: (url, params, response) =>  {
 					return response.data;
 				},
+				layout: 'fitDataStretchFrozen',
+				index: 'akte_id',
+				selectableRangeMode: 'click',
+				persistenceID: 'stv-details-accepted-2026020401',
 				columns: [
+					{title: "akte_id", field: "akte_id", visible: false},
 					{title: "Dokument", field: "bezeichnung"},
 					{title: "Akzeptiertdatum", field: "docdatum",
 						formatter: function (cell) {
@@ -78,7 +80,6 @@ export default {
 							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
 						}},
 					{title: "Infotext", field: "infotext"},
-					{title: "akte_id", field: "akte_id"},
 					{title: "dms_id", field: "dms_id", visible: false},
 					{title: "titel", field: "titel_intern", visible: false},
 					{title: "vorhanden", field: "vorhanden",
@@ -167,44 +168,30 @@ export default {
 					handler: async () => {
 						await this.$p.loadCategory(['global', 'dokumente', 'ui', 'mobility', 'ampeln']);
 
-						let cm = this.$refs.table.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('global', 'dokument')
-						});
-						cm.getColumnByField('docdatum').component.updateDefinition({
-							title: this.$p.t('dokumente', 'datumAkzeptiert')
-						});
-						cm.getColumnByField('dokument_kurzbz').component.updateDefinition({
-							title: this.$p.t('mobility', 'kurzbz')
-						});
-						cm.getColumnByField('insertvonma').component.updateDefinition({
-							title: this.$p.t('dokumente', 'akzeptiertVon')
-						});
-						cm.getColumnByField('hochgeladenamum').component.updateDefinition({
-							title: this.$p.t('global', 'uploaddatum')
-						});
-						cm.getColumnByField('nachgereicht').component.updateDefinition({
-							title: this.$p.t('dokumente', 'nachgereicht')
-						});
-						cm.getColumnByField('vorhanden').component.updateDefinition({
-							title: this.$p.t('dokumente', 'vorhanden')
-						});
-						cm.getColumnByField('dms_id').component.updateDefinition({
-							title: this.$p.t('global', 'dms_id')
-						});
-						cm.getColumnByField('titel_intern').component.updateDefinition({
-							title: this.$p.t('global', 'titel')
-						});
-						cm.getColumnByField('anmerkung_intern').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('akte_id').component.updateDefinition({
-							title: this.$p.t('global', 'akte_id')
-						});
-						cm.getColumnByField('nachgereicht_am').component.updateDefinition({
-							title: this.$p.t('dokumente', 'nachreichungAm')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+						setHeader('bezeichnung', this.$p.t('global', 'dokument'));
+						setHeader('docdatum', this.$p.t('dokumente', 'datumAkzeptiert'));
+						setHeader('dokument_kurzbz', this.$p.t('mobility', 'kurzbz'));
+						setHeader('insertvonma', this.$p.t('dokumente', 'akzeptiertVon'));
+						setHeader('hochgeladenamum', this.$p.t('global', 'uploaddatum'));
+						setHeader('nachgereicht', this.$p.t('dokumente', 'nachgereicht'));
+						setHeader('vorhanden', this.$p.t('dokumente', 'vorhanden'));
+						setHeader('dms_id', this.$p.t('global', 'dms_id'));
+						setHeader('titel_intern', this.$p.t('global', 'titel'));
+						setHeader('anmerkung_intern', this.$p.t('global', 'anmerkung'));
+						setHeader('akte_id', this.$p.t('global', 'akte_id'));
+						setHeader('nachgereicht_am', this.$p.t('dokumente', 'nachreichungAm'));
 					}
 				},
 				{
@@ -322,7 +309,7 @@ export default {
 		}
 	},
 	template: `
-	 <div class="stv-details-documents h-100 pb-3">
+	 <div class="stv-details-aceepted h-100 pb-3">
 		<h5>{{$p.t('dokumente', 'accepted')}}</h5>
 
 		 <modal-edit
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 9afaea71c..c92d52d39 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -17,12 +17,10 @@ export default {
 	},
 	data(){
 		return {
-			layout: 'fitDataStretchFrozen',
 			layoutColumnsOnNewData: false,
 			height: 300,
 			selectable: true,
 			selectableRangeMode: 'click',
-			persistenceID: 'core-details-documents-unaccepted',
 			listDocuments: [],
 			prestudentDocumentData: [],
 		}
@@ -37,6 +35,8 @@ export default {
 						studiengang_kz: this.studiengang_kz})
 				),
 				ajaxResponse: (url, params, response) => response.data,
+				persistenceID: 'stv-details-unaccepted-2026020401',
+				layout: 'fitDataStretchFrozen',
 				columns: [
 					{title: "Dokument", field: "bezeichnung"},
 					{title: "Kurzbz", field: "dokument_kurzbz", visible: false},
@@ -184,38 +184,29 @@ export default {
 					handler: async () => {
 						await this.$p.loadCategory(['global', 'dokumente', 'ui', 'mobility', 'ampeln']);
 
-						let cm = this.$refs.table.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('global', 'dokument')
-						});
-						cm.getColumnByField('dokument_kurzbz').component.updateDefinition({
-							title: this.$p.t('mobility', 'kurzbz')
-						});
-						cm.getColumnByField('hochgeladenamum').component.updateDefinition({
-							title: this.$p.t('global', 'uploaddatum')
-						});
-						cm.getColumnByField('nachgereicht').component.updateDefinition({
-							title: this.$p.t('dokumente', 'nachgereicht')
-						});
-						cm.getColumnByField('vorhanden').component.updateDefinition({
-							title: this.$p.t('dokumente', 'vorhanden')
-						});
-						cm.getColumnByField('titel_intern').component.updateDefinition({
-							title: this.$p.t('global', 'titel')
-						});
-						cm.getColumnByField('anmerkung_intern').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('akte_id').component.updateDefinition({
-							title: this.$p.t('global', 'akte_id')
-						});
-						cm.getColumnByField('pflicht').component.updateDefinition({
-							title: this.$p.t('ampeln', 'mandatory')
-						});
-						cm.getColumnByField('nachgereicht_am').component.updateDefinition({
-							title: this.$p.t('global', 'dokument')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('bezeichnung', this.$p.t('global', 'dokument'));
+						setHeader('dokument_kurzbz', this.$p.t('mobility', 'kurzbz'));
+						setHeader('hochgeladenamum', this.$p.t('global', 'uploaddatum'));
+						setHeader('nachgereicht', this.$p.t('dokumente', 'nachgereicht'));
+						setHeader('vorhanden', this.$p.t('dokumente', 'vorhanden'));
+						setHeader('titel_intern', this.$p.t('global', 'titel'));
+						setHeader('anmerkung_intern', this.$p.t('global', 'anmerkung'));
+						setHeader('akte_id', this.$p.t('global', 'akte_id'));
+						setHeader('pflicht', this.$p.t('ampeln', 'mandatory'));
+						setHeader('nachgereicht_am', this.$p.t('global', 'dokument'));
 					}
 				},
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
index d8cd0aacd..4f25392aa 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -24,12 +24,30 @@ export default {
 	},
 	data(){
 		return {
-			tabulatorOptions: {
+			formData: {
+				mobilitaetstyp_kurzbz: "GS",
+				studiensemester_kurzbz: this.currentSemester,
+				status_kurzbz: 'Student',
+				mobilitaet_id: null
+			},
+			statusNew: true,
+			listTypenMobility: [],
+			listStudiensemester: [],
+			programsMobility: [],
+			listStudienprogramme: [],
+			listPartner: [],
+			statiPrestudent: [],
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					ApiStvJointstudies.getStudies(this.student.prestudent_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
+				persistenceID: 'stv-details-jointstudies',
 				columns: [
 					{title: "mobilitaet_id", field: "mobilitaet_id", visible: false},
 					{title: "StSem", field: "studiensemester_kurzbz"},
@@ -120,70 +138,43 @@ export default {
 						frozen: true
 					},
 				],
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async() => {
 						await this.$p.loadCategory(['global', 'jointstudies', 'ui', 'lehre', 'mobility']);
 
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						let cm = this.$refs.table.tabulator.columnManager;
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
-						cm.getColumnByField('mobilitaet_id').component.updateDefinition({
-							title: this.$p.t('global', 'mobilitaet_id')
-						});
-/*						cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
-							title: this.$p.t('lehre', 'studiensemester')
-						});*/
-						cm.getColumnByField('gsprogrammtyp_kurzbz').component.updateDefinition({
-							title: this.$p.t('global', 'typ')
-						});
-/*						cm.getColumnByField('ausbildungssemester').component.updateDefinition({
-							title: this.$p.t('lehre', 'semester')
-						});*/
-						cm.getColumnByField('prestudent_id').component.updateDefinition({
-							title: this.$p.t('global', 'prestudentID')
-						});
-						cm.getColumnByField('kurzbz').component.updateDefinition({
-							title: this.$p.t('mobility', 'mobilitaetsprogramm')
-						});
-						cm.getColumnByField('studienprogramm').component.updateDefinition({
-							title: this.$p.t('jointstudies', 'studienprogramm')
-						});
-						cm.getColumnByField('insertamum').component.updateDefinition({
-							title: this.$p.t('global', 'insertamum')
-						});
-						cm.getColumnByField('insertvon').component.updateDefinition({
-							title: this.$p.t('global', 'insertvon')
-						});
-						cm.getColumnByField('updateamum').component.updateDefinition({
-							title: this.$p.t('global', 'updateamum')
-						});
-						cm.getColumnByField('updatevon').component.updateDefinition({
-							title: this.$p.t('global', 'updatevon')
-						});
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
 
-/*						cm.getColumnByField('actions').component.updateDefinition({
-						title: this.$p.t('global', 'aktionen')
-						});*/
+						setHeader('mobilitaet_id', this.$p.t('global', 'mobilitaet_id'));
+						setHeader('gsprogrammtyp_kurzbz', this.$p.t('global', 'typ'));
+						setHeader('prestudent_id', this.$p.t('global', 'prestudentID'));
+						setHeader('kurzbz', this.$p.t('mobility', 'mobilitaetsprogramm'));
+						setHeader('studienprogramm', this.$p.t('jointstudies', 'studienprogramm'));
+						setHeader('insertamum', this.$p.t('global', 'insertamum'));
+						setHeader('insertvon', this.$p.t('global', 'insertvon'));
+						setHeader('updateamum', this.$p.t('global', 'updateamum'));
+						setHeader('updatevon', this.$p.t('global', 'updatevon'));
 					}
 				}
-			],
-			formData: {
-				mobilitaetstyp_kurzbz: "GS",
-				studiensemester_kurzbz: this.currentSemester,
-				status_kurzbz: 'Student',
-				mobilitaet_id: null
-			},
-			statusNew: true,
-			listTypenMobility: [],
-			listStudiensemester: [],
-			programsMobility: [],
-			listStudienprogramme: [],
-			listPartner: [],
-			statiPrestudent: [],
-		}
+			];
+			return events;
+		},
 	},
 	methods: {
 		actionDeleteJointStudy(mobilitaet_id) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 41ac0bfe2..73c818317 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -45,8 +45,6 @@ export default{
 				suggestions: null,
 				places: null
 			},
-			index: 'adresse_id',
-			persistenceID: 'stv-details-kontakt-address'
 		}
 	},
 	computed:{
@@ -56,6 +54,8 @@ export default{
 				ajaxRequestFunc: () => this.$api.call(ApiStvAddress.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
 				//autoColumns: true,
+				index: 'adresse_id',
+				persistenceID: 'stv-details-kontakt-address',
 				columns:[
 					{title:"Typ", field:"bezeichnung"},
 					{title:"Strasse", field:"strasse"},
@@ -158,61 +158,39 @@ export default{
 			const events = [
 				{
 					event: 'tableBuilt',
-					handler: async () => {
+					handler: async() => {
 						await this.$p.loadCategory(['notiz', 'global', 'person', 'ui']);
-						let cm = this.$refs.table.tabulator.columnManager;
 
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('global', 'typ')
-						});
-						cm.getColumnByField('strasse').component.updateDefinition({
-							title: this.$p.t('person', 'strasse')
-						});
-						cm.getColumnByField('plz').component.updateDefinition({
-							title: this.$p.t('person', 'plz')
-						});
-						cm.getColumnByField('ort').component.updateDefinition({
-							title: this.$p.t('person', 'ort')
-						});
-						cm.getColumnByField('gemeinde').component.updateDefinition({
-							title: this.$p.t('person', 'gemeinde')
-						});
-						cm.getColumnByField('nation').component.updateDefinition({
-							title: this.$p.t('person', 'nation')
-						});
-						cm.getColumnByField('heimatadresse').component.updateDefinition({
-							title: this.$p.t('person', 'heimatadresse')
-						});
-						cm.getColumnByField('zustelladresse').component.updateDefinition({
-							title: this.$p.t('person', 'zustelladresse')
-						});
-						cm.getColumnByField('co_name').component.updateDefinition({
-							title: this.$p.t('person', 'co_name')
-						});
-						cm.getColumnByField('name').component.updateDefinition({
-							title: this.$p.t('person', 'firma_zusatz')
-						});
-						cm.getColumnByField('firmenname').component.updateDefinition({
-							title: this.$p.t('person', 'firma')
-						});
-						cm.getColumnByField('lastupdate').component.updateDefinition({
-							title: this.$p.t('notiz', 'letzte_aenderung')
-						});
-						cm.getColumnByField('rechnungsadresse').component.updateDefinition({
-							title: this.$p.t('person', 'rechnungsadresse')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('firma_id').component.updateDefinition({
-							title: this.$p.t('ui', 'firma_id')
-						});
-						cm.getColumnByField('adresse_id').component.updateDefinition({
-							title: this.$p.t('ui', 'adresse_id')
-						});
-						cm.getColumnByField('person_id').component.updateDefinition({
-							title: this.$p.t('person', 'person_id')
-						});
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
+
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('bezeichnung', this.$p.t('global', 'typ'));
+						setHeader('strasse', this.$p.t('person', 'strasse'));
+						setHeader('plz', this.$p.t('person', 'plz'));
+						setHeader('ort', this.$p.t('person', 'ort'));
+						setHeader('gemeinde', this.$p.t('person', 'gemeinde'));
+						setHeader('nation', this.$p.t('person', 'nation'));
+						setHeader('heimatadresse', this.$p.t('person', 'heimatadresse'));
+						setHeader('zustelladresse', this.$p.t('person', 'zustelladresse'));
+						setHeader('co_name', this.$p.t('person', 'co_name'));
+						setHeader('name', this.$p.t('person', 'firma_zusatz'));
+						setHeader('firmenname', this.$p.t('person', 'firma'));
+						setHeader('lastupdate', this.$p.t('notiz', 'letzte_aenderung'));
+						setHeader('rechnungsadresse', this.$p.t('person', 'rechnungsadresse'));
+						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
+						setHeader('firma_id', this.$p.t('ui', 'firma_id'));
+						setHeader('adresse_id', this.$p.t('ui', 'adresse_id'));
+						setHeader('person_id', this.$p.t('person', 'person_id'));
 					}
 				}
 			];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index b4752e0c3..47bddb02f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -24,8 +24,6 @@ export default{
 				typ: 'p'
 			},
 			statusNew: true,
-			index: 'bankverbindung_id',
-			persistenceID: 'stv-details-kontakt-bankaccount'
 		}
 	},
 	computed: {
@@ -34,6 +32,8 @@ export default{
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvBankaccount.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
+				index: 'bankverbindung_id',
+				persistenceID: 'stv-details-kontakt-bankaccount',
 				columns:[
 					{title:"Name", field:"name"},
 					{title:"Anschrift", field:"anschrift", visible:false},
@@ -109,33 +109,25 @@ export default{
 					handler: async() => {
 						await this.$p.loadCategory(['global','person']);
 
-						let cm = this.$refs.table.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('name').component.updateDefinition({
-							title: this.$p.t('global', 'name')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
-						cm.getColumnByField('typ').component.updateDefinition({
-							title: this.$p.t('global', 'typ')
-						});
-						cm.getColumnByField('anschrift').component.updateDefinition({
-							title: this.$p.t('person', 'anschrift')
-						});
-						cm.getColumnByField('kontonr').component.updateDefinition({
-							title: this.$p.t('person', 'kontonr')
-						});
-						cm.getColumnByField('blz').component.updateDefinition({
-							title: this.$p.t('person', 'blz')
-						});
-						cm.getColumnByField('verrechnung').component.updateDefinition({
-							title: this.$p.t('person', 'verrechnung')
-						});
-						cm.getColumnByField('person_id').component.updateDefinition({
-							title: this.$p.t('person', 'person_id')
-						});
-						cm.getColumnByField('bankverbindung_id').component.updateDefinition({
-							title: this.$p.t('ui', 'bankverbindung_id')
-						});
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('name', this.$p.t('global','name'));
+						setHeader('typ', this.$p.t('global','typ'));
+						setHeader('anschrift', this.$p.t('person','anschrift'));
+						setHeader('kontonr', this.$p.t('person','kontonr'));
+						setHeader('blz', this.$p.t('person','blz'));
+						setHeader('verrechnung', this.$p.t('person','verrechnung'));
 					}
 				}
 			];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index d9cc1ad55..c9603b1e3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -59,6 +59,7 @@ export default {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvContact.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
+				persistenceID: 'stv-details-kontakt-contact',
 				columns:[
 					{title:"Typ", field:"kontakttypbeschreibung"},
 					{title:"Kontakt", field:"kontakt"},
@@ -134,7 +135,7 @@ export default {
 		},
 		tabulatorEvents() {
 			const events = [
-				{
+/*				{
 					event: 'tableBuilt',
 					handler: async() => {
 						await this.$p.loadCategory(['notiz','global','person']);
@@ -175,6 +176,37 @@ export default {
 							title: this.$p.t('ui', 'standort_id')
 						});
 					}
+				},	*/
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['notiz','global','person']);
+
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
+
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('kontakttypbeschreibung', this.$p.t('global', 'typ'));
+						setHeader('kontakt', this.$p.t('global', 'kontakt'));
+						setHeader('zustellung', this.$p.t('person', 'zustellung'));
+						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
+						setHeader('lastupdate', this.$p.t('notiz', 'letzte_aenderung'));
+						setHeader('name', this.$p.t('person', 'firma'));
+						setHeader('bezeichnung', this.$p.t('person', 'standort'));
+						setHeader('firma_id', this.$p.t('ui', 'firma_id'));
+						setHeader('kontakt_id', this.$p.t('ui', 'kontakt_id'));
+						setHeader('person_id', this.$p.t('person', 'person_id'));
+						setHeader('standort_id', this.$p.t('ui', 'standort_id'));
+					}
 				}
 			];
 			return events;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index 5b0c4e350..6d510a912 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -59,6 +59,7 @@ export default {
 				ajaxResponse: (url, params, response) => {
 					return response.data;
 				},
+				persistenceID: 'stv-details-lvtermine',
 				columns: [
 					{title: "lv_id", field: "lehrveranstaltung_id", visible: false},
 					{title: "lehreinheit_id", field: "lehreinheit_id", visible: false},
@@ -100,35 +101,28 @@ export default {
 					handler: async() => {
 						await this.$p.loadCategory(['global', 'ui', 'lehre']);
 
-						let cm = this.$refs.table.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('lehrveranstaltung_id').component.updateDefinition({
-							title: this.$p.t('lehre', 'lehrveranstaltung_id')
-						});
-						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
-							title: this.$p.t('global', 'lehreinheit_id')
-						});
-						cm.getColumnByField('datum').component.updateDefinition({
-							title: this.$p.t('global', 'datum')
-						});
-						cm.getColumnByField('beginn').component.updateDefinition({
-							title: this.$p.t('ui', 'dateFrom')
-						});
-						cm.getColumnByField('ende').component.updateDefinition({
-							title: this.$p.t('ui', 'dateTo')
-						});
-						cm.getColumnByField('gruppen_kuerzel').component.updateDefinition({
-							title: this.$p.t('global', 'gruppen')
-						});
-						cm.getColumnByField('ort_kurzbz').component.updateDefinition({
-							title: this.$p.t('global', 'ortLocation')
-						});
-						cm.getColumnByField('lektorname').component.updateDefinition({
-							title: this.$p.t('lehre', 'lektor')
-						});
-						cm.getColumnByField('lehrfach_bez').component.updateDefinition({
-							title: this.$p.t('global', 'lehrfach')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('lehrveranstaltung_id', this.$p.t('lehre', 'lehrveranstaltung_id'));
+						setHeader('lehreinheit_id', this.$p.t('global', 'lehreinheit_id'));
+						setHeader('datum', this.$p.t('global', 'datum'));
+						setHeader('beginn', this.$p.t('ui', 'dateFrom'));
+						setHeader('ende', this.$p.t('ui', 'dateTo'));
+						setHeader('gruppen_kuerzel', this.$p.t('global', 'gruppen'));
+						setHeader('ort_kurzbz', this.$p.t('global', 'ortLocation'));
+						setHeader('lektorname', this.$p.t('lehre', 'lektor'));
+						setHeader('lehrfach_bez', this.$p.t('global', 'lehrfach'));
 					}
 				}
 			];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index 69cf70467..af5ea4c4b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -61,8 +61,6 @@ export default {
 			layoutColumnsOnNewData: false,
 			height: 'auto',
 			minHeight: 200,
-			index: 'bisio_id',
-			persistenceID: 'stv-details-table_mobiliy-2025112401'
 		}
 	},
 	watch: {
@@ -80,6 +78,8 @@ export default {
 					ApiStvMobility.getMobilitaeten(this.student.uid)
 				),
 				ajaxResponse: (url, params, response) => response.data,
+				index: 'bisio_id',
+				persistenceID: 'stv-details-table_mobility-2025112401',
 				columns: [
 					{title: "Kurzbz", field: "kurzbz"},
 					{title: "Nation", field: "nation_code"},
@@ -161,26 +161,29 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
+
+						if (!this.$refs.table) return;
+
 						await this.$p.loadCategory(['global', 'person', 'stv', 'mobility', 'ui']);
 
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						let cm = this.$refs.table.tabulator.columnManager;
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
-						cm.getColumnByField('kurzbz').component.updateDefinition({
-							title: this.$p.t('mobility', 'kurzbz_program')
-						});
-						cm.getColumnByField('nation_code').component.updateDefinition({
-							title: this.$p.t('mobility', 'gastnation')
-						});
-						cm.getColumnByField('von').component.updateDefinition({
-							title: this.$p.t('ui', 'von')
-						});
-						cm.getColumnByField('bis').component.updateDefinition({
-							title: this.$p.t('global', 'bis')
-						});
-						cm.getColumnByField('bisio_id').component.updateDefinition({
-							title: this.$p.t('mobility', 'bisio_id')
-						});
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('kurzbz', this.$p.t('mobility', 'kurzbz_program'));
+						setHeader('nation_code', this.$p.t('mobility', 'gastnation'));
+						setHeader('von', this.$p.t('ui', 'von'));
+						setHeader('bis', this.$p.t('global', 'bis'));
+						setHeader('bisio_id', this.$p.t('mobility', 'bisio_id'));
 					}
 				}
 			];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 1fe96188f..ffca391dc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -15,8 +15,7 @@ export default{
 			layout: 'fitDataFill',
 			layoutColumnsOnNewData:	false,
 			height:	'auto',
-			selectable:	false,
-			persistenceID: 'stv-details-prestudent-history',
+			selectable:	false
 		}
 	},
 	computed: {
@@ -26,6 +25,7 @@ export default{
 				ajaxRequestFunc: () => this.$api.call(ApiStvPrestudent.getHistoryPrestudents(this.personId)),
 				ajaxResponse: (url, params, response) => response.data,
 				//autoColumns: true,
+				persistenceID: 'stv-details-prestudent-history',
 				columns:[
 					{title:"StSem", field:"studiensemester_kurzbz"},
 					{title:"Prio", field:"priorisierung"},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 58d42666f..c58027338 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -29,10 +29,41 @@ export default{
 	},
 	data(){
 		return {
-			tabulatorOptions: {
+			pruefungData: {},
+			listTypesExam: [],
+			listLvsAndLes: [],
+			listLvsAndMas: [],
+			listLvs: [],
+			listLes: [],
+			listMas: [],
+			listMarks: [],
+			zeugnisData: [],
+			filter: false,
+			statusNew: true,
+			isStartDropDown: false,
+			isFilterSet: false,
+			showHint: false,
+		}
+	},
+	computed:{
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvExam.getPruefungen(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
+				layout: 'fitDataStretchFrozen',
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				index: 'pruefung_id',
+				persistenceID: 'stv-details-pruefung-list-2026012701',
+				persistence: {
+					sort: true,
+					columns: ["width", "visible", "frozen"],
+					filter: false,
+					headerFilter: false,
+					group: false,
+					page: false
+				},
 				columns: [
 					{title: "Datum", field: "format_datum"},
 					{title: "Lehrveranstaltung", field: "lehrveranstaltung_bezeichnung"},
@@ -87,81 +118,44 @@ export default{
 						},
 						frozen: true
 					}],
-				layout: 'fitDataStretchFrozen',
-				layoutColumnsOnNewData: false,
-				height: 'auto',
-				index: 'pruefung_id',
-				persistenceID: 'stv-details-pruefung-list-2026012701',
-				persistence: {
-					sort: false,
-					columns: ["width", "visible", "frozen"],
-					filter: false,
-					headerFilter: false,
-					group: false,
-					page: false
-				}
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
 						await this.$p.loadCategory(['fristenmanagement', 'global', 'lehre', 'exam', 'ui']);
-						let cm = this.$refs.table.tabulator.columnManager;
 
-						cm.getColumnByField('format_datum').component.updateDefinition({
-							title: this.$p.t('global', 'datum')
-						});
-						cm.getColumnByField('lehrveranstaltung_bezeichnung').component.updateDefinition({
-							title: this.$p.t('lehre', 'lehrveranstaltung')
-						});
-						cm.getColumnByField('note_bezeichnung').component.updateDefinition({
-							title: this.$p.t('lehre', 'note')
-						});
-						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('punkte').component.updateDefinition({
-							title: this.$p.t('exam', 'punkte')
-						});
-						cm.getColumnByField('pruefung_id').component.updateDefinition({
-							title: this.$p.t('ui', 'pruefung_id')
-						});
-						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
-							title: this.$p.t('global', 'lehreinheit_id')
-						});
-						cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
-							title: this.$p.t('ui', 'mitarbeiter_uid')
-						});
-						cm.getColumnByField('student_uid').component.updateDefinition({
-							title: this.$p.t('ui', 'student_uid')
-						});
-						//Uncaught TypeError: e.element.after is not a function
-						/*	cm.getColumnByField('actions').component.updateDefinition({
-								title: this.$p.t('global', 'actions')
-							});*/
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
+
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('format_datum', this.$p.t('global', 'datum'));
+						setHeader('lehrveranstaltung_bezeichnung', this.$p.t('lehre', 'lehrveranstaltung'));
+						setHeader('note_bezeichnung', this.$p.t('lehre', 'note'));
+						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
+						setHeader('pruefungstyp_kurzbz', this.$p.t('global', 'typ'));
+						setHeader('punkte', this.$p.t('exam', 'punkte'));
+						setHeader('pruefung_id', this.$p.t('ui', 'pruefung_id'));
+						setHeader('lehreinheit_id', this.$p.t('global', 'lehreinheit_id'));
+						setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));
+						setHeader('student_uid', this.$p.t('ui', 'student_uid'));
 					}
-				}
-			],
-			pruefungData: {},
-			listTypesExam: [],
-			listLvsAndLes: [],
-			listLvsAndMas: [],
-			listLvs: [],
-			listLes: [],
-			listMas: [],
-			listMarks: [],
-			zeugnisData: [],
-			filter: false,
-			statusNew: true,
-			isStartDropDown: false,
-			isFilterSet: false,
-			showHint: false,
-		}
-	},
-	computed:{
+				},
+			];
+			return events;
+		},
 		lv_teile(){
 			return this.listLvsAndLes.filter(lv => lv.lehrveranstaltung_id == this.pruefungData.lehrveranstaltung_id);
 		},

From 2aca2cd6ab12b2400cf8cb941f02e0fd506a7d78 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 5 Feb 2026 09:55:07 +0100
Subject: [PATCH 37/37] Custom Filter: change colour to green for filter symbol

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c70d8de64..f950b917e 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -579,12 +579,12 @@ export default {
 
 			<template #actions v-if="filter.length">
 			  <div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
-				<p class="text-danger mb-0">
+				<p class="text-success mb-0">
 				  <strong>{{$p.t('filter','filterActive')}}</strong>
 				</p>
 
 				<button
-				  class="btn btn-outline-danger sm"
+				  class="btn btn-outline-success sm"
 				  :title="$p.t('filter/filterDelete')"
 				  @click="resetFilter"
 				>